Merge pull request #2106 from mjwoods/mingw-w64-strcasecmp

Avoid redefinition of strcasecmp under mingw-w64

config.h.cmake.in

@@ -57,23 +57,6 @@ are set when opening a binary file on Windows. */
    #define _OFF_T_DEFINED
    #endif
 
-   #ifdef _WIN32
-    #ifndef strcasecmp
-      #define strcasecmp _stricmp
-    #endif
-
-    #ifndef strincasecmp
-      #define strncasecmp _strnicmp
-    #endif
-
-    #ifndef snprintf
-     #if _MSC_VER<1900
-       #define snprintf _snprintf
-     #endif
-    #endif
-   #endif
-
-
    #define strdup _strdup
    #define fdopen _fdopen
    #define write _write
@@ -678,21 +661,6 @@ with zip */
 /* Define to `unsigned long if <sys/types.h> does not define. */
 #cmakedefine uintptr_t unsigned long
 
-/* Define strcasecmp, strncasecmp, snprintf on Win32 systems. */
-#ifdef _WIN32
-    #ifndef HAVE_STRCASECMP
-	 #define strcasecmp _stricmp
-    #endif
-
-    #ifndef HAVE_STRNCASECMP
-	 #define strncasecmp _strnicmp
-    #endif
-
-    #ifndef HAVE_SNPRINTF
-	 #define snprintf _snprintf
-    #endif
-#endif
-
 #cmakedefine WORDS_BIGENDIAN
 
 #include "ncconfigure.h"

configure.ac

@@ -1801,16 +1801,6 @@ AC_SUBST(DO_FILTER_TESTS,[$enable_filter_testing])
 AC_SUBST(HAVE_BLOSC,[$enable_blosc])
 AC_SUBST(HAVE_SZIP,[$enable_szip])
 
-# Include some specifics for netcdf on windows.
-#AH_VERBATIM([_WIN32_STRICMP],
-AH_BOTTOM(
-[/* Define strcasecmp, strncasecmp, snprintf on Win32 systems. */
-#ifdef _WIN32
-	#define strcasecmp _stricmp
-	#define strncasecmp _strnicmp
-	#define snprintf _snprintf
-#endif])
-
 # Access netcdf specific version of config.h
 AH_BOTTOM([#include "ncconfigure.h"])
 

dap4_test/dump.c

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

include/ncconfigure.h

@@ -62,19 +62,32 @@ extern unsigned long long int strtoull(const char*, char**, int);
 #endif
 
 #endif /*STDC*/
-#endif /*!_WIN32*/
 
-#ifdef _WIN32
+#else /*_WIN32*/
+
 #ifndef HAVE_STRLCAT
 #define strlcat(d,s,n) strcat_s((d),(n),(s))
 #endif
-#ifndef HAVE_STRCASECMP
+
+
+#ifndef __MINGW32__
+#ifndef strcasecmp
 #define strcasecmp _stricmp
 #endif
+#ifndef strncasecmp
+#define strncasecmp _strnicmp
+#endif
+#ifndef snprintf
+#if _MSC_VER<1900
+#define snprintf _snprintf
+#endif
+#endif
 #ifndef fileno
 #define fileno(f) _fileno(f)
 #endif
-#endif
+#endif /*__MINGW32__*/
+
+#endif /*_WIN32*/
 
 /* handle null arguments */
 #ifndef nulldup

libdispatch/ncjson.c

@@ -62,7 +62,7 @@ typedef struct NCJbuf {
 
 /**************************************************/
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #define strdup _strdup
 #define strcasecmp _stricmp
 #else

libdispatch/nclist.c

@@ -6,7 +6,7 @@
 
 #include "nclist.h"
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #define strcasecmp _stricmp
 #endif
 

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,11 +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"
-#define strcasecmp _stricmp
-#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"