summaryrefslogtreecommitdiffstats
path: root/src/H5Fpkg.h
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2002-04-28 08:34:17 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2002-04-28 08:34:17 (GMT)
commit73683e4380583563699330b8e32b1a34a476447a (patch)
tree546dc25c90c284a3630788ebef4693791810e028 /src/H5Fpkg.h
parenteb09629a45ce8b1fbc435c4f27f1cf4e297d6826 (diff)
downloadhdf5-73683e4380583563699330b8e32b1a34a476447a.zip
hdf5-73683e4380583563699330b8e32b1a34a476447a.tar.gz
hdf5-73683e4380583563699330b8e32b1a34a476447a.tar.bz2
[svn-r5278] Purpose:
Migrate from configure macros of XYZ_ABC to H5_XYZ_ABC Description: configure generates many macros definitions on the fly and were stored in src/H5config.h which is included by H5public.h. But other software that uses hdf5 may also run their own configure. There can be a clash in macro name space. We decided awhile ago to prepend all generated macros with "H5_" to avoid conflicts. The process has started and this commit completes it (at least attempt to). Solution: Many macros symbols (e.g. SIZEOF_xxx and HAVE_xxx were changed to H5_SIZEOF_xxx and H5_HAVE_xxx). Then H5private.h no longer includes H5config.h. This cuts H5config.h away from HDF5 source code. Pending issues: The module of fortran and pablo are to be resolved in a different commit. Platforms tested: eirene (parallel), arabica (solaris 7 --enable-fortran, --enable-cxx)
Diffstat (limited to 'src/H5Fpkg.h')
-rw-r--r--src/H5Fpkg.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index bb36ba6..458ac1e 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2001 NCSA
+ * Copyright (C) 2000-2002 NCSA
* All rights reserved.
*
* Programmer: Quincey Koziol <koziol@ncsa.uiuc.edu>
@@ -55,13 +55,13 @@
* Macros that check for overflows. These are somewhat dangerous to fiddle
* with.
*/
-#if (SIZEOF_SIZE_T >= SIZEOF_OFF_T)
+#if (H5_SIZEOF_SIZE_T >= H5_SIZEOF_OFF_T)
# define H5F_OVERFLOW_SIZET2OFFT(X) \
((size_t)(X)>=(size_t)((size_t)1<<(8*sizeof(off_t)-1)))
#else
# define H5F_OVERFLOW_SIZET2OFFT(X) 0
#endif
-#if (H5_SIZEOF_HSIZE_T >= SIZEOF_OFF_T)
+#if (H5_SIZEOF_HSIZE_T >= H5_SIZEOF_OFF_T)
# define H5F_OVERFLOW_HSIZET2OFFT(X) \
((hsize_t)(X)>=(hsize_t)((hsize_t)1<<(8*sizeof(off_t)-1)))
#else