[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, 6 insertions, 76 deletions

diff --git a/src/H5Mprivate.h b/src/H5Mprivate.h
index cde2cda..8455dc7 100644
--- a/src/H5Mprivate.h
+++ b/src/H5Mprivate.h
@@ -16,16 +16,17 @@
  * This file contains macros & information for meta-objects
  */
 
-#ifndef H5MPRIVATE_H
-#define H5MPRIVATE_H
+#ifndef _H5Mprivate_H
+#define _H5Mprivate_H
+#include <H5Mpublic.h>   /* Include Public Definitions */
 
-#include "H5Mproto.h"   /* Include Public Definitions */
+/* Private headers needed by this file */
+#include <H5private.h>
 
 /*
  * A function table record for accessing interfaces which use the "meta"
  *  interface to create/access/release objects.
  */
-
 typedef struct meta_func_t
   {
     hobjtype_t type;            /* Object type this interface is for */
@@ -46,78 +47,7 @@ typedef struct meta_func_t
   }
 meta_func_t;
 
-meta_func_t meta_func_arr[]={
-    {   /* Template object meta-functions (defined in H5C.c) */
-        H5_TEMPLATE,            /* File-Creation Template Type ID */
-        H5C_create,             /* File-Creation Template Create */
-        NULL,                   /* File-Creation Template Access */
-        H5C_copy,               /* File-Creation Template Copy */
-        NULL,                   /* File-Creation Template FindName */
-        NULL,                   /* File-Creation Template NameLen */
-        NULL,                   /* File-Creation Template GetName */
-        NULL,                   /* File-Creation Template SetName */
-        NULL,                   /* File-Creation Template Search */
-        NULL,                   /* File-Creation Template Index */
-        NULL,                   /* File-Creation Template Flush */
-        NULL,                   /* File-Creation Template Delete */
-        NULL,                   /* File-Creation Template GetParent */
-        NULL,                   /* File-Creation Template GetFile */
-        H5C_release             /* File-Creation Template Release */
-    },
-    {   /* Datatype object meta-functions (defined in H5T.c) */
-        H5_DATATYPE,            /* Datatype Type ID */
-        H5T_create,             /* Datatype Create */
-        NULL,                   /* Datatype Access */
-        NULL,                   /* Dataspace Copy */
-        NULL,                   /* Datatype FindName */
-        NULL,                   /* Datatype NameLen */
-        NULL,                   /* Datatype GetName */
-        NULL,                   /* Datatype SetName */
-        NULL,                   /* Datatype Search */
-        NULL,                   /* Datatype Index */
-        NULL,                   /* Datatype Flush */
-        NULL,                   /* Datatype Delete */
-        NULL,                   /* Datatype GetParent */
-        NULL,                   /* Datatype GetFile */
-        H5T_release             /* Datatype Release */
-    },
-    {   /* Dimensionality object meta-functions (defined in H5P.c) */
-        H5_DATASPACE,           /* Dimensionality Type ID */
-        H5P_create,             /* Dimensionality Create */
-        NULL,                   /* Dimensionality Access */
-        NULL,                   /* Dimensionality Copy */
-        NULL,                   /* Dimensionality FindName */
-        NULL,                   /* Dimensionality NameLen */
-        NULL,                   /* Dimensionality GetName */
-        NULL,                   /* Dimensionality SetName */
-        NULL,                   /* Dimensionality Search */
-        NULL,                   /* Dimensionality Index */
-        NULL,                   /* Dimensionality Flush */
-        NULL,                   /* Dimensionality Delete */
-        NULL,                   /* Dimensionality GetParent */
-        NULL,                   /* Dimensionality GetFile */
-        H5P_release             /* Dimensionality Release */
-    },
-    {   /* Dataset object meta-functions (defined in H5D.c) */
-        H5_DATASPACE,           /* Dataset Type ID */
-        H5D_create,             /* Dataset Create */
-        NULL,                   /* Dataset Access */
-        NULL,                   /* Dataset Copy */
-        NULL,                   /* Dataset FindName */
-        NULL,                   /* Dataset NameLen */
-        NULL,                   /* Dataset GetName */
-        NULL,                   /* Dataset SetName */
-        NULL,                   /* Dataset Search */
-        NULL,                   /* Dataset Index */
-        H5D_flush,              /* Dataset Flush */
-        NULL,                   /* Dataset Delete */
-        NULL,                   /* Dataset GetParent */
-        NULL,                   /* Dataset GetFile */
-        H5D_release             /* Dataset Release */
-    }
-  };
 
 /* Private functions, not part of the publicly documented API */
 
-#endif /* H5MPRIVATE_H */
-
+#endif