Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Mingw versus XGetopt (again) #2009

Merged
merged 3 commits into from
May 27, 2021
Merged

Fix Mingw versus XGetopt (again) #2009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3f6c12
Fix Mingw versus XGetopt (again)
DennisHeimbigner May 26, 2021
014db82
Update Release notes
DennisHeimbigner May 26, 2021
e0ddc7c
Merge branch 'master' into xgetoptmingw.dmh
WardF May 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion dap4_test/dump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <getopt.h>
#endif

#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "XGetopt.h"
#define snprintf _snprintf
#endif
Expand Down
2 changes: 1 addition & 1 deletion ncdump/nccopy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <getopt.h>
#endif

#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "XGetopt.h"
#define snprintf _snprintf
#endif
Expand Down
3 changes: 2 additions & 1 deletion ncdump/ncdump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ncdump/ncvalidator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ncdump/ocprint.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include "oc.h"
#include "ocx.h"

#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "XGetopt.h"
#endif

Expand Down
2 changes: 1 addition & 1 deletion ncgen/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <getopt.h>
#endif

#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "XGetopt.h"
#endif

Expand Down
2 changes: 1 addition & 1 deletion ncgen3/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <getopt.h>
#endif

#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "XGetopt.h"
#define snprintf _snprintf
#endif
Expand Down
2 changes: 1 addition & 1 deletion nczarr_test/bm_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <getopt.h>
#endif

#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "XGetopt.h"
#endif

Expand Down
2 changes: 1 addition & 1 deletion nczarr_test/ncdumpchunks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <getopt.h>
#endif

#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "XGetopt.h"
#endif

Expand Down
3 changes: 2 additions & 1 deletion nczarr_test/s3util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
#ifdef _WIN32

#if defined(_WIN32) && !defined(__MINGW32__)
#include "XGetopt.h"
#endif

Expand Down
2 changes: 1 addition & 1 deletion nczarr_test/test_nczarr_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <getopt.h>
#endif

#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "XGetopt.h"
#endif

Expand Down
2 changes: 1 addition & 1 deletion nczarr_test/tst_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <getopt.h>
#endif

#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
#include "XGetopt.h"
#endif

Expand Down
2 changes: 1 addition & 1 deletion nczarr_test/ut_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion nczarr_test/zmapio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
#ifdef _WIN32

#if defined(_WIN32) && !defined(__MINGW32__)
#include "XGetopt.h"
#endif

Expand Down
3 changes: 2 additions & 1 deletion nczarr_test/zs3parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
#ifdef _WIN32

#if defined(_WIN32) && !defined(__MINGW32__)
#include "XGetopt.h"
#endif

Expand Down