summaryrefslogtreecommitdiffstats
path: root/tools/lib
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 /tools/lib
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 'tools/lib')
-rw-r--r--tools/lib/h5tools_str.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index e75ac3d..0820cfb 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 National Center for Supercomputing Applications
+ * Copyright (c) 2001-2002 National Center for Supercomputing Applications
* All rights reserved.
*
* Programmer: Bill Wendling <wendling@ncsa.uiuc.edu>
@@ -517,8 +517,8 @@ h5tools_str_sprint(h5tools_str_t *str, const h5dump_t *info, hid_t container,
/* Build default formats for long long types */
if (!fmt_llong[0]) {
- sprintf(fmt_llong, "%%%sd", PRINTF_LL_WIDTH);
- sprintf(fmt_ullong, "%%%su", PRINTF_LL_WIDTH);
+ sprintf(fmt_llong, "%%%sd", H5_PRINTF_LL_WIDTH);
+ sprintf(fmt_ullong, "%%%su", H5_PRINTF_LL_WIDTH);
}
/* Append value depending on data type */