mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-03-01 17:06:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added windows-specific code to allow for alloca usage.

Browse Source
This commit is contained in:
Ward Fisher 2013-03-19 19:52:32 +00:00
parent 0d37707254
commit 8c4fe8775a
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -187,6 +187,7 @@ MACRO(print_conf_summary)
MESSAGE(STATUS "\tBuilding netCDF-4:\t\t" ${ENABLE_NETCDF_4}) MESSAGE(STATUS "\tBuilding netCDF-4:\t\t" ${ENABLE_NETCDF_4})
MESSAGE(STATUS "\tBuilding DAP Support:\t\t" ${ENABLE_DAP}) MESSAGE(STATUS "\tBuilding DAP Support:\t\t" ${ENABLE_DAP})
MESSAGE(STATUS "\tBuilding Utilities:\t\t" ${BUILD_UTILITIES}) MESSAGE(STATUS "\tBuilding Utilities:\t\t" ${BUILD_UTILITIES})
MESSAGE(STATUS "\tHDF5_ROOT_DIR:\t\t:" ${HDF5_ROOT_DIR})
IF(CMAKE_PREFIX_PATH) IF(CMAKE_PREFIX_PATH)
MESSAGE(STATUS "\tCMake Prefix Path:\t\t" "${CMAKE_PREFIX_PATH}") MESSAGE(STATUS "\tCMake Prefix Path:\t\t" "${CMAKE_PREFIX_PATH}")
ENDIF() ENDIF()

4
include/netcdf.h
View File

@ -14,6 +14,10 @@ for more info.
#include <stddef.h> /* size_t, ptrdiff_t */ #include <stddef.h> /* size_t, ptrdiff_t */
#include <errno.h> /* netcdf functions sometimes return system errors */ #include <errno.h> /* netcdf functions sometimes return system errors */
/* Required for alloca on Windows */
#if defined(_WIN32) || defined(_WIN64)
#include <malloc.h>
#endif
#ifdef _WIN64 #ifdef _WIN64
#include <sys/stat.h> #include <sys/stat.h>

3
libsrc/putget.c
View File

@ -23,6 +23,9 @@
#endif #endif
#include "nc3dispatch.h" #include "nc3dispatch.h"
#if defined(_WIN32) || defined(_WIN64)
#include <malloc.h>
#endif
#undef MIN /* system may define MIN somewhere and complain */ #undef MIN /* system may define MIN somewhere and complain */
#define MIN(mm,nn) (((mm) < (nn)) ? (mm) : (nn)) #define MIN(mm,nn) (((mm) < (nn)) ? (mm) : (nn))

5
oc2/ocinternal.h
View File

@ -6,6 +6,11 @@
#include "config.h" #include "config.h"
#if defined(_WIN32) || defined(_WIN64)
#include <malloc.h>
#endif
#ifdef _AIX #ifdef _AIX
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif