Unidata · letmaik · Aug 10, 2018 · Aug 10, 2018 · Aug 13, 2018 · Sep 13, 2018
diff --git a/include/netcdf.h b/include/netcdf.h
@@ -16,7 +16,7 @@ See \ref copyright file for more info.
 #include <errno.h>  /* netcdf functions sometimes return system errors */
 
 /* Required for alloca on Windows */
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32)
 #include <malloc.h>
 #endif
 

diff --git a/include/onstack.h b/include/onstack.h
@@ -63,7 +63,7 @@
 
 # define FREE_ONSTACK(name)
 
-#elif defined(_WIN32) || defined(_WIN64)
+#elif defined(_WIN32)
 #include <malloc.h>
 #undef ALLOCA_ARG_T
 # define ALLOCA_ARG_T size_t

diff --git a/libdap4/d4util.c b/libdap4/d4util.c
@@ -379,7 +379,7 @@ NCD4_mktmp(const char* base, char** tmpnamep)
 	if(rno < 0) rno = -rno;
         snprintf(spid,sizeof(spid),"%06d",rno);
         strncat(tmp,spid,sizeof(tmp));
-#if defined(_WIN32) || defined(_WIN64)
+#ifdef _WIN32
         fd=open(tmp,O_RDWR|O_BINARY|O_CREAT, _S_IREAD|_S_IWRITE);
 #  else
         fd=open(tmp,O_RDWR|O_CREAT|O_EXCL, S_IRWXU);

diff --git a/libdap4/ncd4dispatch.c b/libdap4/ncd4dispatch.c
@@ -6,7 +6,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#if defined(_WIN32) || defined(_WIN64)
+#ifdef _WIN32
 #include <crtdbg.h>
 #include <direct.h>
 #endif

diff --git a/libdispatch/ddispatch.c b/libdispatch/ddispatch.c
@@ -77,7 +77,7 @@ NCDISPATCH_initialize(void)
 	char* p;
 	char* q;
 	char cwd[4096];
-#ifdef _MSC_VER
+#ifdef _WIN32
         tempdir = getenv("TEMP");
 #else
 	tempdir = "/tmp";

diff --git a/libdispatch/dfile.c b/libdispatch/dfile.c
@@ -2526,7 +2526,7 @@ openmagic(struct MagicFile* file)
     {
         if(file->path == NULL || strlen(file->path)==0)
 	    {status = NC_EINVAL; goto done;}
-#ifdef _MSC_VER
+#ifdef _WIN32
         file->fp = fopen(file->path, "rb");
 #else
         file->fp = fopen(file->path, "r");

diff --git a/libdispatch/dutil.c b/libdispatch/dutil.c
@@ -168,7 +168,7 @@ NC_readfile(const char* filename, NCbytes* content)
     FILE* stream = NULL;
     char part[1024];
 
-#ifdef _MSC_VER
+#ifdef _WIN32
     stream = NCfopen(filename,"rb");
 #else
     stream = NCfopen(filename,"r");
@@ -237,7 +237,7 @@ NC_mktmp(const char* base)
             strncat(tmp,spid,sizeof(tmp));
 	}
 #endif /* HAVE_MKTEMP */
-#ifdef _MSC_VER
+#ifdef _WIN32
         fd=NCopen3(tmp,O_RDWR|O_BINARY|O_CREAT, _S_IREAD|_S_IWRITE);
 #else
         fd=NCopen3(tmp,O_RDWR|O_CREAT|O_EXCL, S_IRWXU);

diff --git a/libdispatch/dwinpath.c b/libdispatch/dwinpath.c
@@ -155,7 +155,7 @@ static char*
 makeabsolute(const char* relpath)
 {
     char* path = NULL;
-#ifdef _MSC_VER
+#ifdef _WIN32
     path = _fullpath(NULL,relpath,8192);
 #else
     path = realpath(relpath, NULL);

diff --git a/libsrc/memio.c b/libsrc/memio.c
@@ -138,7 +138,7 @@ memio_new(const char* path, int ioflags, off_t initialsize, ncio** nciopp, NCMEM
     assert(path != NULL);
 
     if(pagesize == 0) {
-#if defined (_WIN32) || defined(_WIN64)
+#if defined (_WIN32) && !defined(__MINGW32__)
       SYSTEM_INFO info;
       GetSystemInfo (&info);
       pagesize = info.dwPageSize;

diff --git a/libsrc/posixio.c b/libsrc/posixio.c
@@ -27,7 +27,7 @@
 #endif
 
 /* Windows platforms, including MinGW, Cygwin, Visual Studio */
-#if defined(_WIN32) || defined(_WIN64)
+#ifdef _WIN32
 #include <windows.h>
 #include <winbase.h>
 #include <io.h>
@@ -146,7 +146,7 @@ static size_t
 pagesize(void)
 {
   size_t pgsz;
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32)
   SYSTEM_INFO info;
 #endif
 /* Hmm, aren't standards great? */
@@ -155,7 +155,7 @@ pagesize(void)
 #endif
 
   /* For MinGW Builds */
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32)
   GetSystemInfo(&info);
   pgsz = (size_t)info.dwPageSize;
 #elif defined(_SC_PAGESIZE)

diff --git a/nc_test/test_read.m4 b/nc_test/test_read.m4
@@ -19,7 +19,7 @@ dnl (MPI_Offset vs. size_t), and function name substrings for external data
 dnl types.
 dnl
 
-#if defined (_WIN32) || defined (_WIN64)
+#ifdef _WIN32
 #include <io.h>
 #endif
 

diff --git a/nc_test/test_write.m4 b/nc_test/test_write.m4
@@ -19,7 +19,7 @@ dnl (MPI_Offset vs. size_t), and function name substrings for external data
 dnl types.
 dnl
 
-#if defined (_WIN32) || defined (_WIN64)
+#ifdef _WIN32
 #include <io.h>
 #endif
 

diff --git a/nc_test/tst_diskless5.c b/nc_test/tst_diskless5.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <sys/types.h>
-#if defined (_WIN32) || defined (_WIN64) || defined _MSC_VER
+#ifdef _WIN32
 #include <io.h>
 #else
 #include <unistd.h>

diff --git a/nc_test4/tst_atts1.c b/nc_test4/tst_atts1.c
@@ -352,7 +352,7 @@ main(int argc, char **argv)
       /* for (i = 0; i < ATT_LEN; i++) */
       /* 	  if (float_in[i] != (float) longlong_out[i]) ERR; */
       if (nc_get_att_float(ncid, NC_GLOBAL, ATT_UINT64_NAME, float_in)) ERR;
-#if !defined(_WIN32) && !defined(_WIN64)
+#ifndef _WIN32
 	  for (i = 0; i < ATT_LEN; i++)
 	  if (float_in[i] != (float) ulonglong_out[i]) ERR;
 #endif

diff --git a/nc_test4/tst_udf.c b/nc_test4/tst_udf.c
@@ -15,7 +15,7 @@
 
 #define FILE_NAME "tst_udf.nc"
 
-#if defined(_WIN32) || defined(_WIN64)
+#ifdef _WIN32
 int
 NC4_show_metadata(int ncid)
 {