[netcdf-c]Fix build error on linux. (#6865)

This commit is contained in:
JackBoosY 2019-06-13 07:30:49 +08:00 committed by Robert Schumacher
parent 8c49e565c0
commit 57eea4e7c2
3 changed files with 30 additions and 1 deletions

View File

@ -1,4 +1,4 @@
Source: netcdf-c
Version: 4.7.0-1
Version: 4.7.0-2
Build-Depends: hdf5, curl
Description: a set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.

View File

@ -0,0 +1,28 @@
diff --git a/include/ncconfigure.h b/include/ncconfigure.h
index 2c5b2c8..d397790 100644
--- a/include/ncconfigure.h
+++ b/include/ncconfigure.h
@@ -25,20 +25,20 @@ missing functions should be
defined and missing types defined.
*/
-#ifndef HAVE_STRDUP
+#ifndef strdup
extern char* strdup(const char*);
#endif
/* handle null arguments */
#ifndef nulldup
-#ifdef HAVE_STRDUP
+#ifdef strdup
#define nulldup(s) ((s)==NULL?NULL:strdup(s))
#else
char *nulldup(const char* s);
#endif
#endif
-#ifdef _MSC_VER
+#ifdef _WIN32
#ifndef HAVE_SSIZE_T
#include <basetsd.h>
typedef SSIZE_T ssize_t;

View File

@ -12,6 +12,7 @@ vcpkg_from_github(
transitive-hdf5.patch
hdf5.patch
hdf5_2.patch
fix-build-error-on-linux.patch
)
#Remove outdated find modules