summaryrefslogtreecommitdiffstats
path: root/src/H5public.h
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1999-11-16 19:08:14 (GMT)
committerRobb Matzke <matzke@llnl.gov>1999-11-16 19:08:14 (GMT)
commit4b2dbd56519082544a101a54b43b17376d82fc5c (patch)
treeff0dc4040d69c8525f3f3e73c0e7dab30b331280 /src/H5public.h
parentd78a1e0f04e18f0b9a3e352d1d386f7b17c85bc8 (diff)
downloadhdf5-4b2dbd56519082544a101a54b43b17376d82fc5c.zip
hdf5-4b2dbd56519082544a101a54b43b17376d82fc5c.tar.gz
hdf5-4b2dbd56519082544a101a54b43b17376d82fc5c.tar.bz2
[svn-r1832] * 1999-11-16
** configure.in ** configure [REGENERATED] ** src/H5private.h ** src/H5public.h ** src/Makefile.in Generates an H5pubconf.h file which is just like H5config.h except all the preprocessor symbols have `H5_' prepended. This was done so that the configuration results can be used in public header files without polluting the namespace. ** src/H5.c Added H5I_REFERENCE and H5I_VFL to the API tracing code so their names are printed instead of just numbers. ** src/H5FDstdio.c ** tools/h5import.c ** tools/h5repart.c ** tools/pdb2hdf.c Changed to use the `H5_' versions of configure results since these files include only the public API. ** test/big.c Removed a compiler warning. ** test/h5test.c Removed unused code.
Diffstat (limited to 'src/H5public.h')
-rw-r--r--src/H5public.h63
1 files changed, 14 insertions, 49 deletions
diff --git a/src/H5public.h b/src/H5public.h
index ceec110..2568cff 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -23,61 +23,26 @@ static char RcsId[] = "@(#)$Revision$";
#ifndef _H5public_H
#define _H5public_H
-/*
- * Undefine things that might get redefined in the H5config.h file if hdf5 is
- * being included by other packages that use autoconf. The problem is that
- * if the C preprocessor emits warning messages about redefinitions then
- * autoconf will become confused and think that the hdf5 header file doesn't
- * exist.
- */
-#undef SIZEOF_INT8_T
-#undef SIZEOF_INT_FAST8_T
-#undef SIZEOF_INT_LEAST8_T
-#undef SIZEOF_UINT8_T
-#undef SIZEOF_UINT_FAST8_T
-#undef SIZEOF_UINT_LEAST8_T
-
-#undef SIZEOF_INT16_T
-#undef SIZEOF_INT_FAST16_T
-#undef SIZEOF_INT_LEAST16_T
-#undef SIZEOF_UINT16_T
-#undef SIZEOF_UINT_FAST16_T
-#undef SIZEOF_UINT_LEAST16_T
-
-#undef SIZEOF_INT32_T
-#undef SIZEOF_INT_FAST32_T
-#undef SIZEOF_INT_LEAST32_T
-#undef SIZEOF_UINT32_T
-#undef SIZEOF_UINT_FAST32_T
-#undef SIZEOF_UINT_LEAST32_T
-
-#undef SIZEOF_INT64_T
-#undef SIZEOF_INT_FAST64_T
-#undef SIZEOF_INT_LEAST64_T
-#undef SIZEOF_UINT64_T
-#undef SIZEOF_UINT_FAST64_T
-#undef SIZEOF_UINT_LEAST64_T
-
/* Include files for public use... */
-#include <H5config.h> /*from configure */
+#include <H5pubconf.h> /*from configure */
#include <sys/types.h>
-#ifdef STDC_HEADERS
+#ifdef H5_STDC_HEADERS
# include <limits.h> /*for H5T_NATIVE_CHAR defn in H5Tpublic.h */
#endif
-#ifdef HAVE_STDINT_H
+#ifdef H5_HAVE_STDINT_H
# include <stdint.h> /*for C9x types */
#endif
-#ifdef HAVE_STDDEF_H
+#ifdef H5_HAVE_STDDEF_H
# include <stddef.h>
#endif
-#ifdef HAVE_PARALLEL
+#ifdef H5_HAVE_PARALLEL
# include <mpi.h>
#ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already*/
# include <mpio.h>
#endif
#endif
-#ifdef HAVE_GASS
+#ifdef H5_HAVE_GASS
#include "globus_common.h"
#include "globus_gass_file.h"
#endif
@@ -129,11 +94,11 @@ typedef int htri_t;
* sizes are enabled then use a 64-bit data type, otherwise use the size of
* memory objects.
*/
-#ifdef HAVE_LARGE_HSIZET
-# if SIZEOF_LONG_LONG>=8
+#ifdef H5_HAVE_LARGE_HSIZET
+# if H5_SIZEOF_LONG_LONG>=8
typedef unsigned long long hsize_t;
typedef signed long long hssize_t;
-# elif SIZEOF___INT64>=8
+# elif H5_SIZEOF___INT64>=8
typedef unsigned __int64 hsize_t;
typedef signed __int64 hssize_t;
# endif
@@ -145,19 +110,19 @@ typedef ssize_t hssize_t;
/*
* File addresses have there own types.
*/
-#if SIZEOF_UINT64_T>=8
+#if H5_SIZEOF_UINT64_T>=8
typedef uint64_t haddr_t;
# define HADDR_UNDEF ((haddr_t)(int64_t)(-1))
-#elif SIZEOF_INT>=8
+#elif H5_SIZEOF_INT>=8
typedef unsigned haddr_t;
# define HADDR_UNDEF ((haddr_t)(-1))
-#elif SIZEOF_LONG>=8
+#elif H5_SIZEOF_LONG>=8
typedef unsigned long haddr_t;
# define HADDR_UNDEF ((haddr_t)(long)(-1))
-#elif SIZEOF_LONG_LONG>=8
+#elif H5_SIZEOF_LONG_LONG>=8
typedef unsigned long long haddr_t;
# define HADDR_UNDEF ((haddr_t)(long long)(-1))
-#elif SIZEOF___INT64>=8
+#elif H5_SIZEOF___INT64>=8
typedef unsigned __int64 haddr_t;
# define HADDR_UNDEF ((haddr_t)(__int64)(-1))
#else