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

Merge branch 'remove_x_int64' of https://github.com/wkliao/netcdf-c into v4.5.0-release-branch

Browse Source
This commit is contained in:
Ward Fisher 2017-06-07 12:20:29 -06:00
commit 1d9bd601bd
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/nc4internal.h
View File

@ -66,6 +66,9 @@ typedef enum {VAR, DIM, ATT} NC_OBJ_T;
#define X_LONG_MIN X_INT_MIN
#define X_LONG_MAX X_INT_MAX
#define X_UINT_MAX 4294967295U
#define X_INT64_MIN (-9223372036854775807LL-1LL)
#define X_INT64_MAX 9223372036854775807LL
#define X_UINT64_MAX 18446744073709551615ULL
#ifdef WIN32 /* Windows, of course, has to be a *little* different. */
#define X_FLOAT_MAX 3.402823466e+38f
#else

3
include/netcdf.h
View File

@ -101,9 +101,6 @@ extern "C" {
#define NC_MAX_INT64 (9223372036854775807LL)
#define NC_MIN_INT64 (-9223372036854775807LL-1)
#define NC_MAX_UINT64 (18446744073709551615ULL)
#define X_INT64_MAX (9223372036854775807LL)
#define X_INT64_MIN (-X_INT64_MAX - 1)
#define X_UINT64_MAX (18446744073709551615ULL)
/**@}*/
/** Name of fill value attribute. If you wish a variable to use a

6
libsrc/ncx.h
View File

@ -92,9 +92,9 @@
#define X_INT_MIN (-2147483647-1)
#define X_INT_MAX 2147483647
#define X_UINT_MAX 4294967295U
#define X_LONGLONG_MIN (-9223372036854775807LL-1LL)
#define X_LONGLONG_MAX 9223372036854775807LL
#define X_ULONGLONG_MAX 18446744073709551615ULL
#define X_INT64_MIN (-9223372036854775807LL-1LL)
#define X_INT64_MAX 9223372036854775807LL
#define X_UINT64_MAX 18446744073709551615ULL
#define X_FLOAT_MAX 3.402823466e+38f
#define X_FLOAT_MIN (-X_FLOAT_MAX)
#define X_FLT_MAX X_FLOAT_MAX /* alias compatible with limits.h */