[svn-r12314] Purpose:

    Code cleanup

Description:
    Big clean up on high-level library code, including:
        - Removing include of HDF5 private header file(!)
        - Reduce number of compiler warnings
        - Untangle header files, etc.

Platforms tested:
    FreeBSD 4.11 (sleipnir) w/C++
    Linux 2.4/64 (mir) w/C++ & FORTRAN

1 files changed, 64 insertions, 0 deletions

diff --git a/hl/src/H5HLprivate2.h b/hl/src/H5HLprivate2.h
new file mode 100644
index 0000000..534c7f9
--- /dev/null
+++ b/hl/src/H5HLprivate2.h
@@ -0,0 +1,64 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef _H5HLprivate2_H
+#define _H5HLprivate2_H
+
+/* Public HDF5 header */
+#include "hdf5.h"
+
+/* Public High-Level header */
+#include "hdf5_hl.h"
+
+/* The following is copied from src/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
+
+#endif /* _H5HLprivate2_H */
+