Merge pull request #2009 from DennisHeimbigner/xgetoptmingw.dmh

Fix Mingw versus XGetopt (again)
Unidata · May 27, 2021 · 73e7b84 · 73e7b84
2 parents 991069e + e0ddc7c
commit 73e7b84
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 15 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -6,6 +6,7 @@ Release Notes       {#RELEASE_NOTES}
 This file contains a high-level description of this package's evolution. Releases are in reverse chronological order (most recent first). Note that, as of netcdf 4.2, the `netcdf-c++` and `netcdf-fortran` libraries have been separated into their own libraries.
 ## 4.8.1 - TBD
 
+* [Bug Fix] Fix bug in use of XGetopt when building under Mingw. See [Github #2009](https://github.com/Unidata/netcdf-c/issues/2009).
 * [Enhancement] Improve the error reporting when attempting to use a filter for which no implementation can be found in HDF5_PLUGIN_PATH. See [Github #2000](https://github.com/Unidata/netcdf-c/pull/2000) for more information.
 * [Bug Fix] Fix `make distcheck` issue in `nczarr_test/` directory. See [Github #2007](https://github.com/Unidata/netcdf-c/issues/2007).
 * [Bug Fix] Fix bug in NCclosedir in dpathmgr.c. See [Github #2003](https://github.com/Unidata/netcdf-c/issues/2003).

diff --git a/dap4_test/dump.c b/dap4_test/dump.c
@@ -15,7 +15,7 @@
 #include <getopt.h>
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include "XGetopt.h"
 #define snprintf _snprintf
 #endif

diff --git a/ncdump/nccopy.c b/ncdump/nccopy.c
@@ -13,7 +13,7 @@
 #include <getopt.h>
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include "XGetopt.h"
 #define snprintf _snprintf
 #endif

diff --git a/ncdump/ncdump.c b/ncdump/ncdump.c
@@ -8,7 +8,8 @@ Research/Unidata. See \ref copyright file for more info.  */
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
-#ifdef _WIN32
+
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include "XGetopt.h"
 #define snprintf _snprintf
 #endif

diff --git a/ncdump/ncvalidator.c b/ncdump/ncvalidator.c
@@ -73,7 +73,7 @@ THIS SOFTWARE.
 #include <unistd.h>     /* read() getopt() */
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include <io.h>
 #include "XGetopt.h"
 #define snprintf _snprintf

diff --git a/ncdump/ocprint.c b/ncdump/ocprint.c
@@ -31,7 +31,7 @@
 #include "oc.h"
 #include "ocx.h"
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include "XGetopt.h"
 #endif
 

diff --git a/ncgen/main.c b/ncgen/main.c
@@ -12,7 +12,7 @@
 #include <getopt.h>
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include "XGetopt.h"
 #endif
 

diff --git a/ncgen3/main.c b/ncgen3/main.c
@@ -15,7 +15,7 @@
 #include <getopt.h>
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include "XGetopt.h"
 #define snprintf _snprintf
 #endif

diff --git a/nczarr_test/bm_utils.c b/nczarr_test/bm_utils.c
@@ -15,7 +15,7 @@
 #include <getopt.h>
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include "XGetopt.h"
 #endif
 

diff --git a/nczarr_test/ncdumpchunks.c b/nczarr_test/ncdumpchunks.c
@@ -10,7 +10,7 @@
 #include <getopt.h>
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include "XGetopt.h"
 #endif
 

diff --git a/nczarr_test/s3util.c b/nczarr_test/s3util.c
@@ -13,7 +13,8 @@
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
-#ifdef _WIN32
+
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include "XGetopt.h"
 #endif
 

diff --git a/nczarr_test/test_nczarr_utils.h b/nczarr_test/test_nczarr_utils.h
@@ -21,7 +21,7 @@
 #include <getopt.h>
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include "XGetopt.h"
 #endif
 

diff --git a/nczarr_test/tst_utils.c b/nczarr_test/tst_utils.c
@@ -14,7 +14,7 @@
 #include <getopt.h>
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include "XGetopt.h"
 #endif
 

diff --git a/nczarr_test/ut_test.c b/nczarr_test/ut_test.c
@@ -11,7 +11,7 @@ x *      Copyright 2018, University Corporation for Atmospheric Research
 #include <getopt.h>
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include "XGetopt.h"
 #endif
 

diff --git a/nczarr_test/zmapio.c b/nczarr_test/zmapio.c
@@ -13,7 +13,8 @@
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
-#ifdef _WIN32
+
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include "XGetopt.h"
 #endif
 

diff --git a/nczarr_test/zs3parse.c b/nczarr_test/zs3parse.c
@@ -13,7 +13,8 @@
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
-#ifdef _WIN32
+
+#if defined(_WIN32) && !defined(__MINGW32__)
 #include "XGetopt.h"
 #endif