[svn-r35] ./src/H5ACproto.h

./src/H5Aproto.h
./src/H5Bproto.h
./src/H5Cproto.h
./src/H5Dproto.h
./src/H5Eproto.h
./src/H5Fproto.h
./src/H5Gproto.h
./src/H5Hproto.h
./src/H5MFproto.h
./src/H5MMproto.h
./src/H5Mproto.h
./src/H5Oproto.h
./src/H5Pproto.h
./src/H5Tproto.h
./src/H5proto.h
	These files were removed from the library and renamed by
	changing `proto' to `public'.

./src/H5ACpublic.h	NEW
./src/H5Apublic.h	NEW
./src/H5Bpublic.h	NEW
./src/H5Cpublic.h	NEW
./src/H5Dpublic.h	NEW
./src/H5Epublic.h	NEW
./src/H5Fpublic.h	NEW
./src/H5Gpublic.h	NEW
./src/H5Hpublic.h	NEW
./src/H5MFpublic.h	NEW
./src/H5MMpublic.h	NEW
./src/H5Mpublic.h	NEW
./src/H5Opublic.h	NEW
./src/H5Ppublic.h	NEW
./src/H5Tpublic.h	NEW
./src/H5public.h	NEW
	These files came from the old H5*proto.h files.

./src/Makefile
./src/Makefile.in	NEW
	Removed.  Now generated automatically from Makefile.in by
	running configure.

./src/h5oplat.h
./src/hdf5fort.h
./src/hdf5gen.h
./src/hdf5glob.h
./src/hdf5lims.h
./src/hdf5meta.h
./src/hdf5pabl.h
./src/hdf5plat.h
./src/hdf5port.h
./src/hdf5type.h
	Removed.  The contents of these files has moved to other
	header files or source files depending on it's nature.

./src/H5.c
./src/H5A.c
./src/H5B.c
./src/H5C.c
./src/H5D.c
./src/H5E.c
./src/H5F.c
./src/H5G.c
./src/H5H.c
./src/H5M.c
./src/H5MF.c
./src/H5MM.c
./src/H5O.c
./src/H5Ocont.c
./src/H5Oname.c
./src/H5Onull.c
./src/H5Ostab.c
./src/H5P.c
./src/H5T.c
	Fixed include files.  Moved some things from old headers into
	these files.

./src/H5ACprivate.h
./src/H5Aprivate.h
./src/H5Bprivate.h
./src/H5Cprivate.h
./src/H5Dprivate.h
./src/H5Eprivate.h
./src/H5Fprivate.h
./src/H5Gprivate.h
./src/H5Hprivate.h
./src/H5MFprivate.h
./src/H5MMprivate.h
./src/H5Mprivate.h
./src/H5Oprivate.h
./src/H5Pprivate.h
./src/H5Tprivate.h
./src/H5private.h
./src/debug.c
	Fixed include files.

./src/hdf5.h
	This is now the top-level *PUBLIC* include file.  It should
	never appear in the library *.c files.

1 files changed, 13 insertions, 11 deletions

diff --git a/src/H5.c b/src/H5.c
index 02b3cb6..7ebda45 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -35,21 +35,23 @@ static char RcsId[] = "@(#)$Revision$";
        H5_init_interface    -- initialize the H5 interface
    + */
 
-#define HDF5_MASTER
-#include "hdf5.h"
-#undef HDF5_MASTER
 
 /* private headers */
-#include "H5ACprivate.h"		/*cache				*/
-#include "H5Bprivate.h"			/*B-link trees			*/
-#include "H5private.h"			/* Generic info */
+#include <H5private.h>			/*library			*/
+#include <H5ACprivate.h>		/*cache				*/
+#include <H5Bprivate.h>			/*B-link trees			*/
+#include <H5Eprivate.h>			/*error handling		*/
 
 #define PABLO_MASK	H5_mask
 
 /*--------------------- Locally scoped variables -----------------------------*/
 
 /* Whether we've installed the library termination function yet for this interface */
-static intn interface_initialize_g = FALSE;
+static hbool_t interface_initialize_g = FALSE;
+
+hbool_t library_initialize_g = FALSE;
+hbool_t	thread_initialize_g = FALSE;
+hbool_t install_atexit_g = TRUE;
 
 /*------------------_-- Local function prototypes ----------------------------*/
 static herr_t H5_init_interface(void);
@@ -71,8 +73,8 @@ herr_t H5_init_library(void)
     FUNC_ENTER (H5_init_library, NULL, FAIL);
 
     /* Install atexit() library cleanup routine */
-    if(install_atexit==TRUE)
-        if (HDatexit(&H5_term_library) != 0)
+    if(install_atexit_g==TRUE)
+        if (atexit(&H5_term_library) != 0)
           HRETURN_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL);
 
     FUNC_LEAVE (SUCCEED);
@@ -173,8 +175,8 @@ herr_t H5dont_atexit(void)
 {
     FUNC_ENTER (H5dont_atexit, NULL, FAIL);
 
-    if(install_atexit == TRUE)
-        install_atexit=FALSE;
+    if(install_atexit_g == TRUE)
+        install_atexit_g=FALSE;
 
     FUNC_LEAVE (SUCCEED);
 } /* end H5dont_atexit() */