Use strcasecmp definitions from config.h

dap4_test/dump.c

@@ -17,7 +17,6 @@
 
 #if defined(_WIN32) && !defined(__MINGW32__)
 #include "XGetopt.h"
-#define snprintf _snprintf
 #endif
     
 #include "netcdf.h"

libdispatch/ncjson.c

@@ -12,14 +12,9 @@ TODO: make utf8 safe
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
+#include "config.h"
 #include "ncjson.h"
 
-#if defined(_WIN32) && !defined(__MINGW32__)
-#define strcasecmp _stricmp
-#else
-#include <strings.h>
-#endif
-
 #undef DEBUG
 
 #define NCJ_OK 0

libdispatch/nclist.c

@@ -3,13 +3,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-
+#include "config.h"
 #include "nclist.h"
 
-#if defined(_WIN32) && !defined(__MINGW32__)
-#define strcasecmp _stricmp
-#endif
-
 int nclistnull(void* e) {return e == NULL;}
 
 #ifndef TRUE

ncdump/nccopy.c

@@ -15,7 +15,6 @@
 
 #if defined(_WIN32) && !defined(__MINGW32__)
 #include "XGetopt.h"
-#define snprintf _snprintf
 #endif
 
 #ifdef HAVE_UNISTD_H

ncdump/ncdump.c

@@ -11,7 +11,6 @@ Research/Unidata. See \ref copyright file for more info.  */
 
 #if defined(_WIN32) && !defined(__MINGW32__)
 #include "XGetopt.h"
-#define snprintf _snprintf
 #endif
 
 #ifdef HAVE_UNISTD_H

ncdump/ncvalidator.c

@@ -76,7 +76,6 @@ THIS SOFTWARE.
 #if defined(_WIN32) && !defined(__MINGW32__)
 #include <io.h>
 #include "XGetopt.h"
-#define snprintf _snprintf
 #endif
 
 #define X_ALIGN         4

ncgen/ncgen.h

@@ -6,13 +6,7 @@
  *   $Header: /upc/share/CVS/netcdf-3/ncgen/ncgen.h,v 1.18 2010/06/01 15:34:53 ed Exp $
 *********************************************************************/
 
-#ifdef _WIN32
-#include <float.h>
-#include "isnan.h"
-#ifndef __MINGW32__
-#define strcasecmp _stricmp
-#endif
-#endif
+#include "config.h"
 
 #ifdef USE_NETCDF4
 #define CLASSICONLY 0

ncgen3/main.c

@@ -17,7 +17,6 @@
 
 #if defined(_WIN32) && !defined(__MINGW32__)
 #include "XGetopt.h"
-#define snprintf _snprintf
 #endif
 
 #include "netcdf.h"