diff options
Diffstat (limited to 'src/H5private.h')
| -rw-r--r-- | src/H5private.h | 149 |
1 files changed, 70 insertions, 79 deletions
diff --git a/src/H5private.h b/src/H5private.h index c5c96ab..33f4fc3 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1998-2001 NCSA + * Copyright (C) 1998-2002 NCSA * All rights reserved. * * Programmer: Robb Matzke <matzke@llnl.gov> @@ -16,16 +16,6 @@ #include "H5public.h" /* Include Public Definitions */ -/* - * Since H5config.h is a generated header file, it is messy to try - * to put a #ifndef _H5config_H ... #endif guard in it. - * HDF5 has set an internal rule that it is being included here. - * Source files should NOT include H5config.h directly but include - * it via H5private.h. The #ifndef _H5private_H guard above would - * prevent repeated include. - */ -#include "H5config.h" /* Include all configuration info */ - /* include the pthread header */ #ifdef H5_HAVE_THREADSAFE #include <pthread.h> @@ -135,6 +125,7 @@ # include <io.h> #endif + #ifdef WIN32 #define VC_EXTRALEAN /*Exclude rarely-used stuff from Windows headers */ @@ -275,16 +266,16 @@ MS doesn't recognize it yet (as of April 2001) * supported by the compiler, usually 64 bits. It must be legal to qualify * `long_long' with `unsigned'. */ -#if SIZEOF_LONG_LONG>0 +#if H5_SIZEOF_LONG_LONG>0 # define long_long long long -#elif SIZEOF___INT64>0 +#elif H5_SIZEOF___INT64>0 # define long_long __int64 /*Win32*/ -# undef SIZEOF_LONG_LONG -# define SIZEOF_LONG_LONG SIZEOF___INT64 +# undef H5_SIZEOF_LONG_LONG +# define H5_SIZEOF_LONG_LONG H5_SIZEOF___INT64 #else # define long_long long int -# undef SIZEOF_LONG_LONG -# define SIZEOF_LONG_LONG SIZEOF_LONG +# undef H5_SIZEOF_LONG_LONG +# define H5_SIZEOF_LONG_LONG H5_SIZEOF_LONG #endif /* @@ -294,114 +285,114 @@ MS doesn't recognize it yet (as of April 2001) * be exactly one byte wide because we use it for pointer calculations to * void* memory. */ -#if SIZEOF_INT8_T==0 +#if H5_SIZEOF_INT8_T==0 typedef signed char int8_t; -# undef SIZEOF_INT8_T -# define SIZEOF_INT8_T SIZEOF_CHAR -#elif SIZEOF_INT8_T==1 +# undef H5_SIZEOF_INT8_T +# define H5_SIZEOF_INT8_T H5_SIZEOF_CHAR +#elif H5_SIZEOF_INT8_T==1 #else # error "the int8_t type must be 1 byte wide" #endif -#if SIZEOF_UINT8_T==0 +#if H5_SIZEOF_UINT8_T==0 typedef unsigned char uint8_t; -# undef SIZEOF_UINT8_T -# define SIZEOF_UINT8_T SIZEOF_CHAR -#elif SIZEOF_UINT8_T==1 +# undef H5_SIZEOF_UINT8_T +# define H5_SIZEOF_UINT8_T H5_SIZEOF_CHAR +#elif H5_SIZEOF_UINT8_T==1 #else # error "the uint8_t type must be 1 byte wide" #endif -#if SIZEOF_INT16_T>=2 -#elif SIZEOF_SHORT>=2 +#if H5_SIZEOF_INT16_T>=2 +#elif H5_SIZEOF_SHORT>=2 typedef short int16_t; -# undef SIZEOF_INT16_T -# define SIZEOF_INT16_T SIZEOF_SHORT -#elif SIZEOF_INT>=2 +# undef H5_SIZEOF_INT16_T +# define H5_SIZEOF_INT16_T H5_SIZEOF_SHORT +#elif H5_SIZEOF_INT>=2 typedef int int16_t; -# undef SIZEOF_INT16_T -# define SIZEOF_INT16_T SIZEOF_INT +# undef H5_SIZEOF_INT16_T +# define H5_SIZEOF_INT16_T H5_SIZEOF_INT #else # error "nothing appropriate for int16_t" #endif -#if SIZEOF_UINT16_T>=2 -#elif SIZEOF_SHORT>=2 +#if H5_SIZEOF_UINT16_T>=2 +#elif H5_SIZEOF_SHORT>=2 typedef unsigned short uint16_t; -# undef SIZEOF_UINT16_T -# define SIZEOF_UINT16_T SIZEOF_SHORT -#elif SIZEOF_INT>=2 +# undef H5_SIZEOF_UINT16_T +# define H5_SIZEOF_UINT16_T H5_SIZEOF_SHORT +#elif H5_SIZEOF_INT>=2 typedef unsigned uint16_t; -# undef SIZEOF_UINT16_T -# define SIZEOF_UINT16_T SIZEOF_INT +# undef H5_SIZEOF_UINT16_T +# define H5_SIZEOF_UINT16_T H5_SIZEOF_INT #else # error "nothing appropriate for uint16_t" #endif -#if SIZEOF_INT32_T>=4 -#elif SIZEOF_SHORT>=4 +#if H5_SIZEOF_INT32_T>=4 +#elif H5_SIZEOF_SHORT>=4 typedef short int32_t; -# undef SIZEOF_INT32_T -# define SIZEOF_INT32_T SIZEOF_SHORT -#elif SIZEOF_INT>=4 +# undef H5_SIZEOF_INT32_T +# define H5_SIZEOF_INT32_T H5_SIZEOF_SHORT +#elif H5_SIZEOF_INT>=4 typedef int int32_t; -# undef SIZEOF_INT32_T -# define SIZEOF_INT32_T SIZEOF_INT -#elif SIZEOF_LONG>=4 +# undef H5_SIZEOF_INT32_T +# define H5_SIZEOF_INT32_T H5_SIZEOF_INT +#elif H5_SIZEOF_LONG>=4 typedef long int32_t; -# undef SIZEOF_INT32_T -# define SIZEOF_INT32_T SIZEOF_LONG +# undef H5_SIZEOF_INT32_T +# define H5_SIZEOF_INT32_T H5_SIZEOF_LONG #else # error "nothing appropriate for int32_t" #endif -#if SIZEOF_UINT32_T>=4 -#elif SIZEOF_SHORT>=4 +#if H5_SIZEOF_UINT32_T>=4 +#elif H5_SIZEOF_SHORT>=4 typedef short uint32_t; -# undef SIZEOF_UINT32_T -# define SIZEOF_UINT32_T SIZEOF_SHORT -#elif SIZEOF_INT>=4 +# undef H5_SIZEOF_UINT32_T +# define H5_SIZEOF_UINT32_T H5_SIZEOF_SHORT +#elif H5_SIZEOF_INT>=4 typedef unsigned int uint32_t; -# undef SIZEOF_UINT32_T -# define SIZEOF_UINT32_T SIZEOF_INT -#elif SIZEOF_LONG>=4 +# undef H5_SIZEOF_UINT32_T +# define H5_SIZEOF_UINT32_T H5_SIZEOF_INT +#elif H5_SIZEOF_LONG>=4 typedef unsigned long uint32_t; -# undef SIZEOF_UINT32_T -# define SIZEOF_UINT32_T SIZEOF_LONG +# undef H5_SIZEOF_UINT32_T +# define H5_SIZEOF_UINT32_T H5_SIZEOF_LONG #else # error "nothing appropriate for uint32_t" #endif -#if SIZEOF_INT64_T>=8 -#elif SIZEOF_INT>=8 +#if H5_SIZEOF_INT64_T>=8 +#elif H5_SIZEOF_INT>=8 typedef int int64_t; -# undef SIZEOF_INT64_T -# define SIZEOF_INT64_T SIZEOF_INT -#elif SIZEOF_LONG>=8 +# undef H5_SIZEOF_INT64_T +# define H5_SIZEOF_INT64_T H5_SIZEOF_INT +#elif H5_SIZEOF_LONG>=8 typedef long int64_t; -# undef SIZEOF_INT64_T -# define SIZEOF_INT64_T SIZEOF_LONG -#elif SIZEOF_LONG_LONG>=8 +# undef H5_SIZEOF_INT64_T +# define H5_SIZEOF_INT64_T H5_SIZEOF_LONG +#elif H5_SIZEOF_LONG_LONG>=8 typedef long_long int64_t; -# undef SIZEOF_INT64_T -# define SIZEOF_INT64_T SIZEOF_LONG_LONG +# undef H5_SIZEOF_INT64_T +# define H5_SIZEOF_INT64_T H5_SIZEOF_LONG_LONG #else # error "nothing appropriate for int64_t" #endif -#if SIZEOF_UINT64_T>=8 -#elif SIZEOF_INT>=8 +#if H5_SIZEOF_UINT64_T>=8 +#elif H5_SIZEOF_INT>=8 typedef unsigned uint64_t; -# undef SIZEOF_UINT64_T -# define SIZEOF_UINT64_T SIZEOF_INT -#elif SIZEOF_LONG>=8 +# undef H5_SIZEOF_UINT64_T +# define H5_SIZEOF_UINT64_T H5_SIZEOF_INT +#elif H5_SIZEOF_LONG>=8 typedef unsigned long uint64_t; -# undef SIZEOF_UINT64_T -# define SIZEOF_UINT64_T SIZEOF_LONG -#elif SIZEOF_LONG_LONG>=8 +# undef H5_SIZEOF_UINT64_T +# define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG +#elif H5_SIZEOF_LONG_LONG>=8 typedef unsigned long_long uint64_t; -# undef SIZEOF_UINT64_T -# define SIZEOF_UINT64_T SIZEOF_LONG_LONG +# undef H5_SIZEOF_UINT64_T +# define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG_LONG #else # error "nothing appropriate for uint64_t" #endif |