merged master

This commit is contained in:
edwardhartnett 2019-08-03 08:09:32 -06:00
commit f724bb7a5c
3 changed files with 2 additions and 4 deletions

View File

@ -2284,8 +2284,6 @@ main(int argc, char**argv)
option_min_chunk_bytes = 0;
else
option_min_chunk_bytes = atol(optarg);
if(option_min_chunk_bytes < 0)
error("-M value must be non-negative integer");
break;
#else
error("-M requires netcdf-4");

View File

@ -18,7 +18,7 @@ Research/Unidata. See \ref copyright file for more info. */
#include <fcntl.h>
#endif
#ifdef _WIN32
#ifdef _MSC_VER
#define snprintf _snprintf
#include "XGetopt.h"
int opterr;

View File

@ -30,7 +30,7 @@
#include "oc.h"
#include "ocx.h"
#ifdef _WIN32
#ifdef _MSC_VER
#include "XGetopt.h"
int opterr, optind;
char* optarg;