mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-23 16:59:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Ward Fisher 2012-09-11 20:17:24 +00:00
parent d6c7112481
commit a900a4a399
5 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -400,8 +400,13 @@ CHECK_FUNCTION_EXISTS(getpagesize HAVE_GETPAGESIZE)
CHECK_FUNCTION_EXISTS(sysconf HAVE_SYSCONF)
CHECK_FUNCTION_EXISTS(mremap HAVE_MREMAP)
CHECK_FUNCTION_EXISTS(getrlimit HAVE_GETRLIMIT)
CHECK_FUNCTION_EXISTS(isnan HAVE_DECL_ISNAN)
CHECK_FUNCTION_EXISTS(isinf HAVE_DECL_ISINF)
#CHECK_FUNCTION_EXISTS(isnan HAVE_DECL_ISNAN_EXISTS)
#IF(HAVE_DECL_ISNAN_EXISTS)
# SET(HAVE_DECL_ISNAN 1 CACHE STRING "")
#ELSE()
# SET(HAVE_DECL_ISNAN 0 CACHE STRING "")
#ENDIF()
#CHECK_FUNCTION_EXISTS(isinf HAVE_DECL_ISINF)
#CHECK_SYMBOL_EXISTS(RLIM_INFINITY "resource.h" HAVE_RLIM_INFINITY)
#INCLUDE_DIRECTORIES(${RESOURCE_H_PATH})

5
cmake_config.h.in
View File

@ -64,7 +64,8 @@
#cmakedefine HAVE_CURLOPT_KEYPASSWD
#cmakedefine HAVE_DECL_ISFINITE 1
#cmakedefine HAVE_DECL_ISNAN 1
//#cmakedefine HAVE_DECL_ISNAN 1
#cmakedefine HAVE_DECL_ISNAN
#cmakedefine HAVE_DECL_SIGNBIT 1
#cmakedefine HAVE_DOPRNT
@ -205,7 +206,7 @@
#cmakedefine HAVE_SYSCONF
#cmakedefine HAVE_MREMAP
#cmakedefine HAVE_DECL_ISINF
#cmakedefine HAVE_DECL_ISNAN
/* Some linux systems have getrlimit, but
no definition of RLIM_INFINITY */

1
ncgen/cvt.c
View File

@ -7,7 +7,6 @@
#include "includes.h"
#include "bytebuffer.h"
#include "isnan.h"
#include <math.h>
static char stmp[256];

14
ncgen/ncgen.h
View File

@ -42,19 +42,19 @@
#define NC_FILLVALUE 31
/* Must be a better way to do this */
#ifndef INFINITE
#ifndef NC_INFINITE
#ifdef _MSC_VER
#define INFINITE (DBL_MAX+DBL_MAX)
#define NAN (INFINITE-INFINITE)
#define NC_INFINITE (DBL_MAX+DBL_MAX)
#define NAN (NC_INFINITE-NC_INFINITE)
#define NANF NAN
#else
#define INFINITE (1.0/0.0)
#define NC_INFINITE (1.0/0.0)
#define NAN (0.0/0.0)
#define NANF (0.0f/0.0f)
#endif
#define INFINITEF (1.0f/0.0f)
#define NEGINFINITEF (-INFINITEF)
#define NEGINFINITE (-INFINITEF)
#define NC_INFINITEF (1.0f/0.0f)
#define NEGNC_INFINITEF (-NC_INFINITEF)
#define NEGNC_INFINITE (-NC_INFINITEF)
#endif
/* nc_class is one of:
NC_GRP NC_DIM NC_VAR NC_ATT NC_TYPE

8
ncgen/ncgenyy.c
View File

@ -1754,9 +1754,9 @@ YY_RULE_SETUP
#line 231 "ncgen.l"
{ /* missing value (pre-2.4 backward compatibility) */
if (ncgtext[0] == '-') {
double_val = NEGINFINITE;
double_val = NEGNC_INFINITE;
} else {
double_val = INFINITE;
double_val = NC_INFINITE;
}
specialconstants = 1;
return lexdebug(DOUBLE_CONST);
@ -1776,9 +1776,9 @@ YY_RULE_SETUP
#line 246 "ncgen.l"
{/* missing value (pre-2.4 backward compatibility)*/
if (ncgtext[0] == '-') {
float_val = NEGINFINITEF;
float_val = NEGNC_INFINITEF;
} else {
float_val = INFINITEF;
float_val = NC_INFINITEF;
}
specialconstants = 1;
return lexdebug(FLOAT_CONST);