mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-11-21 03:13:42 +08:00
merged master
This commit is contained in:
commit
f724bb7a5c
@ -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");
|
||||
|
@ -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;
|
||||
|
@ -30,7 +30,7 @@
|
||||
#include "oc.h"
|
||||
#include "ocx.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
#ifdef _MSC_VER
|
||||
#include "XGetopt.h"
|
||||
int opterr, optind;
|
||||
char* optarg;
|
||||
|
Loading…
Reference in New Issue
Block a user