summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Wells <dwells@cs.uiuc.edu>1999-08-24 19:17:38 (GMT)
committerDan Wells <dwells@cs.uiuc.edu>1999-08-24 19:17:38 (GMT)
commit16739ea9ad5b8b72ffc3390da0a4d5490960d02e (patch)
treef6b60488df853a532e834c95017d0f078d66be29
parent296d9cf76640fa1aab51479def07119236f86cb9 (diff)
downloadhdf5-16739ea9ad5b8b72ffc3390da0a4d5490960d02e.zip
hdf5-16739ea9ad5b8b72ffc3390da0a4d5490960d02e.tar.gz
hdf5-16739ea9ad5b8b72ffc3390da0a4d5490960d02e.tar.bz2
[svn-r1586] There is a problem compiling when the H5TRACE_DECL is void and the -DHAVE_PABLO
flag is used on some machines if the H5TRACE_DECL; precedes PABLO_SAVE(xxx);. There will be a empty statment followed by a variable declaration. The same is true if they are the other way around. I added the semicolon to the PABLO_SAVE macro definition and put H5TRACE_DECL; after PABLO_SAVE(xxx)
-rw-r--r--src/H5private.h19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/H5private.h b/src/H5private.h
index b63476d..13a3fe4 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -177,7 +177,6 @@
#define HDF5_FREESPACE_VERSION 0 /* of the Free-Space Info */
#define HDF5_OBJECTDIR_VERSION 0 /* of the Object Directory format */
#define HDF5_SHAREDHEADER_VERSION 0 /* of the Shared-Header Info */
-#define HDF5_DRIVERINFO_VERSION 0 /* of the Driver Information Block*/
/*
* Status return values for the `herr_t' type.
@@ -395,6 +394,15 @@ typedef int intn;
typedef unsigned uintn;
/*
+ * File addresses.
+ */
+typedef struct {
+ uint64_t offset; /*offset within an HDF5 file */
+} haddr_t;
+
+#define H5F_ADDR_UNDEF {((uint64_t)(-1L))}
+
+/*
* Maximum and minimum values. These should be defined in <limits.h> for the
* most part.
*/
@@ -698,12 +706,9 @@ __DLL__ int64_t HDstrtoll (const char *s, const char **rest, int base);
#define HDwrite(F,M,Z) write(F,M,Z)
/*
- * And now for a couple non-Posix functions... Watch out for systems that
- * define these in terms of macros.
+ * And now for a couple non-Posix functions...
*/
-#ifndef strdup
char *strdup(const char *s);
-#endif
#define HDstrdup(S) strdup(S)
#ifndef HAVE_SNPRINTF
@@ -875,8 +880,8 @@ extern hbool_t H5_libinit_g; /*good thing C's lazy about extern! */
#define FUNC_ENTER_INIT(func_name,interface_init_func,err) { \
CONSTR (FUNC, #func_name); \
+ PABLO_SAVE (ID_ ## func_name) \
H5TRACE_DECL; \
- PABLO_SAVE (ID_ ## func_name); \
\
PABLO_TRACE_ON (PABLO_MASK, pablo_func_id); \
\
@@ -929,7 +934,7 @@ extern hbool_t H5_libinit_g; /*good thing C's lazy about extern! */
* through one of these two sets of macros.
*/
#ifdef HAVE_PABLO
-# define PABLO_SAVE(func_id) intn pablo_func_id = func_id
+# define PABLO_SAVE(func_id) intn pablo_func_id = func_id;
# define PABLO_TRACE_ON(m, f) TRACE_ON(m,f)
# define PABLO_TRACE_OFF(m, f) TRACE_OFF(m,f)
#else