[svn-r24478] Description:

    Review Vailin's "metadata retry" code and make various cleanups to it.

    Also, disallow SWMR access for non-latest format and for non-POSIX VFDs.

Tested on:
    Mac OSX/64 10.9.0 (amazon) w/gcc 4.8 and make check-vfd

1 files changed, 91 insertions, 0 deletions

diff --git a/hl/src/H5HLprivate2.h b/hl/src/H5HLprivate2.h
index 1b67c70..b7a9362 100644
--- a/hl/src/H5HLprivate2.h
+++ b/hl/src/H5HLprivate2.h
@@ -25,5 +25,96 @@
 /* HDF5 private functions */
 #include "H5private.h"
 
+/*
+ * Status return values for the `herr_t' type.
+ * Since some unix/c routines use 0 and -1 (or more precisely, non-negative
+ * vs. negative) as their return code, and some assumption had been made in
+ * the code about that, it is important to keep these constants the same
+ * values.  When checking the success or failure of an integer-valued
+ * function, remember to compare against zero and not one of these two
+ * values.
+ */
+#define SUCCEED		0
+#define FAIL		(-1)
+#define UFAIL		(unsigned)(-1)
+
+/* minimum of two, three, or four values */
+#undef MIN
+#define MIN(a,b)		(((a)<(b)) ? (a) : (b))
+#define MIN2(a,b)		MIN(a,b)
+#define MIN3(a,b,c)		MIN(a,MIN(b,c))
+#define MIN4(a,b,c,d)		MIN(MIN(a,b),MIN(c,d))
+
+/* maximum of two, three, or four values */
+#undef MAX
+#define MAX(a,b)		(((a)>(b)) ? (a) : (b))
+#define MAX2(a,b)		MAX(a,b)
+#define MAX3(a,b,c)		MAX(a,MAX(b,c))
+#define MAX4(a,b,c,d)		MAX(MAX(a,b),MAX(c,d))
+
+/*
+ * HDF Boolean type.
+ */
+#ifndef FALSE
+#   define FALSE 0
+#endif
+#ifndef TRUE
+#   define TRUE 1
+#endif
+#ifndef HDassert
+    #define HDassert(X)         assert(X)
+#endif /* HDassert */
+#ifndef HDcalloc
+    #define HDcalloc(N,Z)               calloc(N,Z)
+#endif /* HDcalloc */
+#ifndef HDfflush
+    #define HDfflush(F)         fflush(F)
+#endif /* HDfflush */
+H5_DLL int HDfprintf (FILE *stream, const char *fmt, ...);
+#ifndef HDfree
+    #define HDfree(M)           free(M)
+#endif /* HDfree */
+#ifndef HDmemcpy
+    #define HDmemcpy(X,Y,Z)             memcpy((char*)(X),(const char*)(Y),Z)
+#endif /* HDmemcpy */
+#ifndef HDmemset
+    #define HDmemset(X,C,Z)             memset(X,C,Z)
+#endif /* HDmemset */
+#ifndef HDrealloc
+    #define HDrealloc(M,Z)              realloc(M,Z)
+#endif /* HDrealloc */
+#ifndef HDsleep
+    #define HDsleep(N)          sleep(N)
+#endif /* HDsleep */
+#ifndef HDstrcat
+    #define HDstrcat(X,Y)               strcat(X,Y)
+#endif /* HDstrcat */
+#ifndef HDstrcmp
+    #define HDstrcmp(X,Y)       strcmp(X,Y)
+#endif /* HDstrcmp */
+#ifndef HDstrlen
+    #define HDstrlen(S)         strlen(S)
+#endif /* HDstrlen */
+#ifndef HDstrrchr
+    #define HDstrrchr(S,C)              strrchr(S,C)
+#endif /* HDstrrchr */
+#ifndef HDstrtod
+    #define HDstrtod(S,R)               strtod(S,R)
+#endif /* HDstrtod */
+#ifndef HDstrtol
+    #define HDstrtol(S,R,N)             strtol(S,R,N)
+#endif /* HDstrtol */
+/*
+ * And now for a couple non-Posix functions...  Watch out for systems that
+ * define these in terms of macros.
+ */
+#if !defined strdup && !defined H5_HAVE_STRDUP
+extern char *strdup(const char *s);
+#endif
+
+#ifndef HDstrdup
+    #define HDstrdup(S)     strdup(S)
+#endif /* HDstrdup */
+
 #endif /* _H5HLprivate2_H */