summaryrefslogtreecommitdiffstats
path: root/src/H5detect.c
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/H5detect.c
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/H5detect.c')
-rw-r--r--src/H5detect.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/H5detect.c b/src/H5detect.c
index 39aeafa..0c789b7 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -1,8 +1,8 @@
/*keep this here -RPM*/
static const char *FileHeader = "\n\
/*-------------------------------------------------------------------------\n\
- * Copyright (C) 1997-2001 National Center for Supercomputing Applications \n\
- * All rights reserved. \n\
+ * Copyright (C) 1997-2002 National Center for Supercomputing Applications \n\
+ * All rights reserved. \n\
* \n\
*-------------------------------------------------------------------------";
/*
@@ -1018,80 +1018,80 @@ main(void)
/*
* C9x integer types.
*/
-#if SIZEOF_INT8_T>0
+#if H5_SIZEOF_INT8_T>0
DETECT_I(int8_t, INT8, d[nd]); nd++;
#endif
-#if SIZEOF_UINT8_T>0
+#if H5_SIZEOF_UINT8_T>0
DETECT_I(uint8_t, UINT8, d[nd]); nd++;
#endif
-#if SIZEOF_INT_LEAST8_T>0
+#if H5_SIZEOF_INT_LEAST8_T>0
DETECT_I(int_least8_t, INT_LEAST8, d[nd]); nd++;
#endif
-#if SIZEOF_UINT_LEAST8_T>0
+#if H5_SIZEOF_UINT_LEAST8_T>0
DETECT_I(uint_least8_t, UINT_LEAST8, d[nd]); nd++;
#endif
-#if SIZEOF_INT_FAST8_T>0
+#if H5_SIZEOF_INT_FAST8_T>0
DETECT_I(int_fast8_t, INT_FAST8, d[nd]); nd++;
#endif
-#if SIZEOF_UINT_FAST8_T>0
+#if H5_SIZEOF_UINT_FAST8_T>0
DETECT_I(uint_fast8_t, UINT_FAST8, d[nd]); nd++;
#endif
-#if SIZEOF_INT16_T>0
+#if H5_SIZEOF_INT16_T>0
DETECT_I(int16_t, INT16, d[nd]); nd++;
#endif
-#if SIZEOF_UINT16_T>0
+#if H5_SIZEOF_UINT16_T>0
DETECT_I(uint16_t, UINT16, d[nd]); nd++;
#endif
-#if SIZEOF_INT_LEAST16_T>0
+#if H5_SIZEOF_INT_LEAST16_T>0
DETECT_I(int_least16_t, INT_LEAST16, d[nd]); nd++;
#endif
-#if SIZEOF_UINT_LEAST16_T>0
+#if H5_SIZEOF_UINT_LEAST16_T>0
DETECT_I(uint_least16_t, UINT_LEAST16, d[nd]); nd++;
#endif
-#if SIZEOF_INT_FAST16_T>0
+#if H5_SIZEOF_INT_FAST16_T>0
DETECT_I(int_fast16_t, INT_FAST16, d[nd]); nd++;
#endif
-#if SIZEOF_UINT_FAST16_T>0
+#if H5_SIZEOF_UINT_FAST16_T>0
DETECT_I(uint_fast16_t, UINT_FAST16, d[nd]); nd++;
#endif
-#if SIZEOF_INT32_T>0
+#if H5_SIZEOF_INT32_T>0
DETECT_I(int32_t, INT32, d[nd]); nd++;
#endif
-#if SIZEOF_UINT32_T>0
+#if H5_SIZEOF_UINT32_T>0
DETECT_I(uint32_t, UINT32, d[nd]); nd++;
#endif
-#if SIZEOF_INT_LEAST32_T>0
+#if H5_SIZEOF_INT_LEAST32_T>0
DETECT_I(int_least32_t, INT_LEAST32, d[nd]); nd++;
#endif
-#if SIZEOF_UINT_LEAST32_T>0
+#if H5_SIZEOF_UINT_LEAST32_T>0
DETECT_I(uint_least32_t, UINT_LEAST32, d[nd]); nd++;
#endif
-#if SIZEOF_INT_FAST32_T>0
+#if H5_SIZEOF_INT_FAST32_T>0
DETECT_I(int_fast32_t, INT_FAST32, d[nd]); nd++;
#endif
-#if SIZEOF_UINT_FAST32_T>0
+#if H5_SIZEOF_UINT_FAST32_T>0
DETECT_I(uint_fast32_t, UINT_FAST32, d[nd]); nd++;
#endif
-#if SIZEOF_INT64_T>0
+#if H5_SIZEOF_INT64_T>0
DETECT_I(int64_t, INT64, d[nd]); nd++;
#endif
-#if SIZEOF_UINT64_T>0
+#if H5_SIZEOF_UINT64_T>0
DETECT_I(uint64_t, UINT64, d[nd]); nd++;
#endif
-#if SIZEOF_INT_LEAST64_T>0
+#if H5_SIZEOF_INT_LEAST64_T>0
DETECT_I(int_least64_t, INT_LEAST64, d[nd]); nd++;
#endif
-#if SIZEOF_UINT_LEAST64_T>0
+#if H5_SIZEOF_UINT_LEAST64_T>0
DETECT_I(uint_least64_t, UINT_LEAST64, d[nd]); nd++;
#endif
-#if SIZEOF_INT_FAST64_T>0
+#if H5_SIZEOF_INT_FAST64_T>0
DETECT_I(int_fast64_t, INT_FAST64, d[nd]); nd++;
#endif
-#if SIZEOF_UINT_FAST64_T>0
+#if H5_SIZEOF_UINT_FAST64_T>0
DETECT_I(uint_fast64_t, UINT_FAST64, d[nd]); nd++;
#endif
-#if SIZEOF_LONG_LONG>0
+#if H5_SIZEOF_LONG_LONG>0
DETECT_I(long_long, LLONG, d[nd]); nd++;
DETECT_I(unsigned long_long, ULLONG, d[nd]); nd++;
#else
@@ -1107,7 +1107,7 @@ main(void)
DETECT_F(float, FLOAT, d[nd]); nd++;
DETECT_F(double, DOUBLE, d[nd]); nd++;
-#if SIZEOF_DOUBLE == SIZEOF_LONG_DOUBLE
+#if H5_SIZEOF_DOUBLE == H5_SIZEOF_LONG_DOUBLE
/*
* If sizeof(double)==sizeof(long double) then assume that `long double'
* isn't supported and use `double' instead. This suppresses warnings on