From 5e483d0184df78b6d3024c5ececff24406ad4b43 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Thu, 5 Apr 2001 12:29:14 -0500 Subject: [svn-r3781] Purpose: Update Description: Changed #include construct to #include "hdf_file.h" so that the GNU compiler can more easily pick up the dependencies which it places in the .depend and Dependencies files. Also regenerated the Dependencies to go along with this. Platforms tested: Linux --- src/Dependencies | 426 ++++++++++++++++++++++++++++++++---------------------- src/H5.c | 30 ++-- src/H5A.c | 24 +-- src/H5AC.c | 16 +- src/H5ACprivate.h | 10 +- src/H5ACpublic.h | 6 +- src/H5Apkg.h | 10 +- src/H5Aprivate.h | 4 +- src/H5Apublic.h | 2 +- src/H5B.c | 26 ++-- src/H5Bprivate.h | 12 +- src/H5Bpublic.h | 6 +- src/H5D.c | 30 ++-- src/H5Dcontig.c | 14 +- src/H5Distore.c | 28 ++-- src/H5Dprivate.h | 16 +- src/H5Dpublic.h | 4 +- src/H5Dseq.c | 28 ++-- src/H5E.c | 12 +- src/H5Eprivate.h | 4 +- src/H5Epublic.h | 4 +- src/H5F.c | 48 +++--- src/H5FD.c | 20 +-- src/H5FDcore.c | 18 +-- src/H5FDcore.h | 6 +- src/H5FDdpss.c | 18 +-- src/H5FDdpss.h | 8 +- src/H5FDfamily.c | 18 +-- src/H5FDfamily.h | 6 +- src/H5FDgass.c | 18 +-- src/H5FDgass.h | 8 +- src/H5FDlog.c | 20 +-- src/H5FDlog.h | 6 +- src/H5FDmpio.c | 18 +-- src/H5FDmpio.h | 8 +- src/H5FDmulti.c | 7 +- src/H5FDmulti.h | 6 +- src/H5FDprivate.h | 6 +- src/H5FDpublic.h | 7 +- src/H5FDsec2.c | 20 +-- src/H5FDsec2.h | 6 +- src/H5FDsrb.c | 18 +-- src/H5FDsrb.h | 8 +- src/H5FDstdio.c | 7 +- src/H5FDstdio.h | 6 +- src/H5FDstream.c | 14 +- src/H5FDstream.h | 2 +- src/H5FL.c | 12 +- src/H5FLprivate.h | 6 +- src/H5Farray.c | 28 ++-- src/H5Fcontig.c | 14 +- src/H5Fistore.c | 28 ++-- src/H5Fpkg.h | 8 +- src/H5Fprivate.h | 4 +- src/H5Fpublic.h | 4 +- src/H5Fseq.c | 28 ++-- src/H5G.c | 28 ++-- src/H5Gent.c | 16 +- src/H5Gnode.c | 32 ++-- src/H5Gpkg.h | 8 +- src/H5Gprivate.h | 12 +- src/H5Gpublic.h | 9 +- src/H5Gstab.c | 18 +-- src/H5HG.c | 22 +-- src/H5HGprivate.h | 9 +- src/H5HGpublic.h | 6 +- src/H5HL.c | 26 ++-- src/H5HLprivate.h | 10 +- src/H5HLpublic.h | 6 +- src/H5I.c | 10 +- src/H5Iprivate.h | 4 +- src/H5Ipublic.h | 2 +- src/H5MF.c | 14 +- src/H5MFprivate.h | 10 +- src/H5MM.c | 10 +- src/H5MMprivate.h | 8 +- src/H5MMpublic.h | 6 +- src/H5O.c | 26 ++-- src/H5Oattr.c | 16 +- src/H5Ocomp.c | 14 +- src/H5Ocont.c | 12 +- src/H5Odtype.c | 14 +- src/H5Oefl.c | 16 +- src/H5Ofill.c | 16 +- src/H5Olayout.c | 16 +- src/H5Omtime.c | 14 +- src/H5Oname.c | 12 +- src/H5Onull.c | 8 +- src/H5Oprivate.h | 20 +-- src/H5Opublic.h | 6 +- src/H5Osdspace.c | 14 +- src/H5Oshared.c | 12 +- src/H5Ostab.c | 16 +- src/H5P.c | 60 ++++---- src/H5Pprivate.h | 8 +- src/H5Ppublic.h | 12 +- src/H5R.c | 22 +-- src/H5Rprivate.h | 4 +- src/H5Rpublic.h | 4 +- src/H5S.c | 14 +- src/H5Sall.c | 16 +- src/H5Shyper.c | 24 +-- src/H5Smpio.c | 14 +- src/H5Snone.c | 16 +- src/H5Spkg.h | 6 +- src/H5Spoint.c | 18 +-- src/H5Sprivate.h | 10 +- src/H5Spublic.h | 4 +- src/H5Sselect.c | 18 +-- src/H5T.c | 26 ++-- src/H5TB.c | 14 +- src/H5TBprivate.h | 6 +- src/H5TS.c | 6 +- src/H5TSprivate.h | 6 +- src/H5Tbit.c | 13 +- src/H5Tconv.c | 16 +- src/H5Tpkg.h | 14 +- src/H5Tprivate.h | 8 +- src/H5Tpublic.h | 4 +- src/H5Tvlen.c | 12 +- src/H5V.c | 12 +- src/H5Vprivate.h | 6 +- src/H5Z.c | 14 +- src/H5Zdeflate.c | 12 +- src/H5Zprivate.h | 8 +- src/H5detect.c | 18 +-- src/H5private.h | 13 +- src/H5public.h | 4 +- src/hdf5.h | 60 ++++---- 129 files changed, 1142 insertions(+), 1049 deletions(-) diff --git a/src/Dependencies b/src/Dependencies index 0983b0f..28c9767 100644 --- a/src/Dependencies +++ b/src/Dependencies @@ -14,13 +14,13 @@ H5.lo: \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5Ipublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ $(srcdir)/H5Dprivate.h \ $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ @@ -29,10 +29,10 @@ H5.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ $(srcdir)/H5FDprivate.h \ @@ -56,13 +56,13 @@ H5A.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ $(srcdir)/H5Dprivate.h \ $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ @@ -71,15 +71,16 @@ H5A.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ $(srcdir)/H5MMprivate.h \ $(srcdir)/H5Pprivate.h \ $(srcdir)/H5Ppublic.h \ + $(srcdir)/H5Spkg.h \ $(srcdir)/H5Apkg.h \ $(srcdir)/H5Aprivate.h \ $(srcdir)/H5Apublic.h @@ -96,11 +97,12 @@ H5AC.lo: \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5Ipublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ + $(srcdir)/H5Fpkg.h \ $(srcdir)/H5FLprivate.h \ - $(srcdir)/H5MMprivate.h + $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h H5B.lo: \ $(srcdir)/H5B.c \ $(srcdir)/H5private.h \ @@ -114,14 +116,16 @@ H5B.lo: \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5Ipublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ + $(srcdir)/H5Fpkg.h \ $(srcdir)/H5FLprivate.h \ $(srcdir)/H5MFprivate.h \ + $(srcdir)/H5FDprivate.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Pprivate.h \ $(srcdir)/H5Ppublic.h \ $(srcdir)/H5Dpublic.h \ @@ -137,9 +141,9 @@ H5B.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Zprivate.h \ + $(srcdir)/H5Sprivate.h \ $(srcdir)/H5FDmpio.h H5D.lo: \ $(srcdir)/H5D.c \ @@ -155,13 +159,13 @@ H5D.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ @@ -170,10 +174,10 @@ H5D.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ $(srcdir)/H5FLprivate.h \ @@ -225,11 +229,11 @@ H5F.lo: \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ $(srcdir)/H5Dprivate.h \ $(srcdir)/H5Dpublic.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ @@ -238,14 +242,15 @@ H5F.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Sprivate.h \ $(srcdir)/H5FLprivate.h \ $(srcdir)/H5Iprivate.h \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ + $(srcdir)/H5Fpkg.h \ $(srcdir)/H5FDprivate.h \ $(srcdir)/H5MMprivate.h \ $(srcdir)/H5Pprivate.h \ @@ -263,13 +268,13 @@ H5Farray.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ @@ -278,18 +283,38 @@ H5Farray.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ + $(srcdir)/H5Fpkg.h \ + $(srcdir)/H5FDprivate.h \ $(srcdir)/H5Iprivate.h \ $(srcdir)/H5MFprivate.h \ + $(srcdir)/H5MMprivate.h \ $(srcdir)/H5Pprivate.h \ $(srcdir)/H5Ppublic.h \ $(srcdir)/H5Vprivate.h \ $(srcdir)/H5FDmpio.h +H5Fcontig.lo: \ + $(srcdir)/H5Fcontig.c \ + $(srcdir)/H5private.h \ + $(srcdir)/H5public.h \ + H5pubconf.h \ + $(srcdir)/H5api_adpt.h \ + H5config.h \ + $(srcdir)/H5Eprivate.h \ + $(srcdir)/H5Epublic.h \ + $(srcdir)/H5Ipublic.h \ + $(srcdir)/H5Fpkg.h \ + $(srcdir)/H5Fprivate.h \ + $(srcdir)/H5Fpublic.h \ + $(srcdir)/H5FDpublic.h \ + $(srcdir)/H5FDprivate.h \ + $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h H5Fistore.lo: \ $(srcdir)/H5Fistore.c \ $(srcdir)/H5private.h \ @@ -303,13 +328,13 @@ H5Fistore.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ @@ -318,15 +343,60 @@ H5Fistore.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ + $(srcdir)/H5Fpkg.h \ $(srcdir)/H5FLprivate.h \ $(srcdir)/H5Iprivate.h \ $(srcdir)/H5MFprivate.h \ + $(srcdir)/H5FDprivate.h \ + $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5Pprivate.h \ + $(srcdir)/H5Ppublic.h \ + $(srcdir)/H5Vprivate.h \ + $(srcdir)/H5FDmpio.h +H5Fseq.lo: \ + $(srcdir)/H5Fseq.c \ + $(srcdir)/H5private.h \ + $(srcdir)/H5public.h \ + H5pubconf.h \ + $(srcdir)/H5api_adpt.h \ + H5config.h \ + $(srcdir)/H5Dprivate.h \ + $(srcdir)/H5Dpublic.h \ + $(srcdir)/H5Ipublic.h \ + $(srcdir)/H5Fprivate.h \ + $(srcdir)/H5Fpublic.h \ + $(srcdir)/H5FDpublic.h \ + $(srcdir)/H5Gprivate.h \ + $(srcdir)/H5Gpublic.h \ + $(srcdir)/H5Bprivate.h \ + $(srcdir)/H5Bpublic.h \ + $(srcdir)/H5ACprivate.h \ + $(srcdir)/H5ACpublic.h \ + $(srcdir)/H5MMpublic.h \ + $(srcdir)/H5Oprivate.h \ + $(srcdir)/H5Opublic.h \ + $(srcdir)/H5HGprivate.h \ + $(srcdir)/H5HGpublic.h \ + $(srcdir)/H5Tprivate.h \ + $(srcdir)/H5Tpublic.h \ + $(srcdir)/H5Rprivate.h \ + $(srcdir)/H5Rpublic.h \ + $(srcdir)/H5Spublic.h \ + $(srcdir)/H5Zprivate.h \ + $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Sprivate.h \ + $(srcdir)/H5Eprivate.h \ + $(srcdir)/H5Epublic.h \ + $(srcdir)/H5Fpkg.h \ + $(srcdir)/H5FDprivate.h \ + $(srcdir)/H5Iprivate.h \ + $(srcdir)/H5MFprivate.h \ $(srcdir)/H5MMprivate.h \ $(srcdir)/H5Pprivate.h \ $(srcdir)/H5Ppublic.h \ @@ -342,14 +412,15 @@ H5FD.lo: \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ $(srcdir)/H5Ipublic.h \ + $(srcdir)/H5Fpkg.h \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5FDprivate.h \ $(srcdir)/H5FLprivate.h \ $(srcdir)/H5Iprivate.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Pprivate.h \ $(srcdir)/H5Ppublic.h \ $(srcdir)/H5Dpublic.h \ @@ -369,9 +440,9 @@ H5FD.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Zprivate.h + $(srcdir)/H5Zprivate.h \ + $(srcdir)/H5Sprivate.h H5FDsec2.lo: \ $(srcdir)/H5FDsec2.c \ $(srcdir)/H5private.h \ @@ -385,10 +456,11 @@ H5FDsec2.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ + $(srcdir)/H5FDprivate.h \ $(srcdir)/H5FDsec2.h \ $(srcdir)/H5FLprivate.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Pprivate.h \ $(srcdir)/H5Ppublic.h \ $(srcdir)/H5Dpublic.h \ @@ -408,9 +480,9 @@ H5FDsec2.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Zprivate.h + $(srcdir)/H5Zprivate.h \ + $(srcdir)/H5Sprivate.h H5FDfamily.lo: \ $(srcdir)/H5FDfamily.c \ $(srcdir)/H5private.h \ @@ -424,9 +496,10 @@ H5FDfamily.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ + $(srcdir)/H5FDprivate.h \ $(srcdir)/H5FDfamily.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Pprivate.h \ $(srcdir)/H5Ppublic.h \ $(srcdir)/H5Dpublic.h \ @@ -446,9 +519,9 @@ H5FDfamily.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Zprivate.h + $(srcdir)/H5Zprivate.h \ + $(srcdir)/H5Sprivate.h H5FDmpio.lo: \ $(srcdir)/H5FDmpio.c \ $(srcdir)/H5private.h \ @@ -462,9 +535,10 @@ H5FDmpio.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ + $(srcdir)/H5FDprivate.h \ $(srcdir)/H5FDmpio.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Pprivate.h \ $(srcdir)/H5Ppublic.h \ $(srcdir)/H5Dpublic.h \ @@ -484,9 +558,9 @@ H5FDmpio.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Zprivate.h + $(srcdir)/H5Zprivate.h \ + $(srcdir)/H5Sprivate.h H5FDcore.lo: \ $(srcdir)/H5FDcore.c \ $(srcdir)/H5private.h \ @@ -500,9 +574,10 @@ H5FDcore.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ + $(srcdir)/H5FDprivate.h \ $(srcdir)/H5FDcore.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Pprivate.h \ $(srcdir)/H5Ppublic.h \ $(srcdir)/H5Dpublic.h \ @@ -522,9 +597,9 @@ H5FDcore.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Zprivate.h + $(srcdir)/H5Zprivate.h \ + $(srcdir)/H5Sprivate.h H5FDdpss.lo: \ $(srcdir)/H5FDdpss.c \ $(srcdir)/hdf5.h \ @@ -563,6 +638,7 @@ H5FDdpss.lo: \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5private.h \ H5config.h \ + $(srcdir)/H5FDprivate.h \ $(srcdir)/H5MMprivate.h H5FDmulti.lo: \ $(srcdir)/H5FDmulti.c \ @@ -612,9 +688,10 @@ H5FDgass.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ + $(srcdir)/H5FDprivate.h \ $(srcdir)/H5FDgass.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Pprivate.h \ $(srcdir)/H5Ppublic.h \ $(srcdir)/H5Dpublic.h \ @@ -634,9 +711,9 @@ H5FDgass.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Zprivate.h + $(srcdir)/H5Zprivate.h \ + $(srcdir)/H5Sprivate.h H5FDlog.lo: \ $(srcdir)/H5FDlog.c \ $(srcdir)/H5private.h \ @@ -650,10 +727,11 @@ H5FDlog.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ + $(srcdir)/H5FDprivate.h \ $(srcdir)/H5FDlog.h \ $(srcdir)/H5FLprivate.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Pprivate.h \ $(srcdir)/H5Ppublic.h \ $(srcdir)/H5Dpublic.h \ @@ -673,9 +751,9 @@ H5FDlog.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Zprivate.h + $(srcdir)/H5Zprivate.h \ + $(srcdir)/H5Sprivate.h H5FDsrb.lo: \ $(srcdir)/H5FDsrb.c \ $(srcdir)/H5private.h \ @@ -689,9 +767,10 @@ H5FDsrb.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ + $(srcdir)/H5FDprivate.h \ $(srcdir)/H5FDsrb.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Pprivate.h \ $(srcdir)/H5Ppublic.h \ $(srcdir)/H5Dpublic.h \ @@ -711,9 +790,9 @@ H5FDsrb.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Zprivate.h + $(srcdir)/H5Zprivate.h \ + $(srcdir)/H5Sprivate.h H5FDstdio.lo: \ $(srcdir)/H5FDstdio.c \ $(srcdir)/hdf5.h \ @@ -751,22 +830,9 @@ H5FDstdio.lo: \ $(srcdir)/H5FDlog.h H5FDstream.lo: \ $(srcdir)/H5FDstream.c \ - $(srcdir)/H5Eprivate.h \ - $(srcdir)/H5Epublic.h \ $(srcdir)/H5public.h \ H5pubconf.h \ - $(srcdir)/H5api_adpt.h \ - $(srcdir)/H5Ipublic.h \ - $(srcdir)/H5private.h \ - H5config.h \ - $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMprivate.h \ - $(srcdir)/H5MMpublic.h \ - $(srcdir)/H5Ppublic.h \ - $(srcdir)/H5Dpublic.h \ - $(srcdir)/H5Fpublic.h \ - $(srcdir)/H5Zpublic.h \ - $(srcdir)/H5FDstream.h + $(srcdir)/H5api_adpt.h H5FL.lo: \ $(srcdir)/H5FL.c \ $(srcdir)/H5private.h \ @@ -797,11 +863,11 @@ H5G.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ $(srcdir)/H5Dprivate.h \ $(srcdir)/H5Dpublic.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ @@ -810,12 +876,13 @@ H5G.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ + $(srcdir)/H5Fpkg.h \ $(srcdir)/H5FLprivate.h \ $(srcdir)/H5Gpkg.h \ $(srcdir)/H5HLprivate.h \ @@ -832,20 +899,21 @@ H5Gent.lo: \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ $(srcdir)/H5Ipublic.h \ - $(srcdir)/H5Gpkg.h \ - $(srcdir)/H5ACprivate.h \ - $(srcdir)/H5ACpublic.h \ + $(srcdir)/H5Fpkg.h \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ + $(srcdir)/H5Gpkg.h \ + $(srcdir)/H5ACprivate.h \ + $(srcdir)/H5ACpublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5HLprivate.h \ $(srcdir)/H5HLpublic.h \ - $(srcdir)/H5MMprivate.h + $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h H5Gnode.lo: \ $(srcdir)/H5Gnode.c \ $(srcdir)/H5private.h \ @@ -859,11 +927,11 @@ H5Gnode.lo: \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5Ipublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ + $(srcdir)/H5Fpkg.h \ $(srcdir)/H5FLprivate.h \ $(srcdir)/H5Gpkg.h \ $(srcdir)/H5Gprivate.h \ @@ -871,7 +939,9 @@ H5Gnode.lo: \ $(srcdir)/H5HLprivate.h \ $(srcdir)/H5HLpublic.h \ $(srcdir)/H5MFprivate.h \ + $(srcdir)/H5FDprivate.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ @@ -880,14 +950,14 @@ H5Gnode.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ $(srcdir)/H5Pprivate.h \ $(srcdir)/H5Ppublic.h \ + $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Dprivate.h \ + $(srcdir)/H5Sprivate.h \ $(srcdir)/H5FDmpio.h H5Gstab.lo: \ $(srcdir)/H5Gstab.c \ @@ -899,13 +969,13 @@ H5Gstab.lo: \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ $(srcdir)/H5Ipublic.h \ - $(srcdir)/H5Gpkg.h \ - $(srcdir)/H5ACprivate.h \ - $(srcdir)/H5ACpublic.h \ + $(srcdir)/H5Fpkg.h \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ + $(srcdir)/H5Gpkg.h \ + $(srcdir)/H5ACprivate.h \ + $(srcdir)/H5ACpublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ @@ -913,6 +983,7 @@ H5Gstab.lo: \ $(srcdir)/H5HLprivate.h \ $(srcdir)/H5HLpublic.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ @@ -921,9 +992,7 @@ H5Gstab.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h H5HG.lo: \ @@ -939,14 +1008,16 @@ H5HG.lo: \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5Ipublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ + $(srcdir)/H5Fpkg.h \ $(srcdir)/H5FLprivate.h \ $(srcdir)/H5HGprivate.h \ $(srcdir)/H5HGpublic.h \ $(srcdir)/H5MFprivate.h \ + $(srcdir)/H5FDprivate.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Pprivate.h \ $(srcdir)/H5Ppublic.h \ $(srcdir)/H5Dpublic.h \ @@ -962,9 +1033,9 @@ H5HG.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Zprivate.h + $(srcdir)/H5Zprivate.h \ + $(srcdir)/H5Sprivate.h H5HL.lo: \ $(srcdir)/H5HL.c \ $(srcdir)/H5private.h \ @@ -978,14 +1049,16 @@ H5HL.lo: \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5Ipublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ + $(srcdir)/H5Fpkg.h \ $(srcdir)/H5FLprivate.h \ $(srcdir)/H5HLprivate.h \ $(srcdir)/H5HLpublic.h \ $(srcdir)/H5MFprivate.h \ + $(srcdir)/H5FDprivate.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Pprivate.h \ $(srcdir)/H5Ppublic.h \ $(srcdir)/H5Dpublic.h \ @@ -1003,9 +1076,9 @@ H5HL.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Zprivate.h \ + $(srcdir)/H5Sprivate.h \ $(srcdir)/H5FDmpio.h H5I.lo: \ $(srcdir)/H5I.c \ @@ -1031,10 +1104,10 @@ H5MF.lo: \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ $(srcdir)/H5Ipublic.h \ + $(srcdir)/H5Fpkg.h \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5FDprivate.h \ $(srcdir)/H5MFprivate.h H5MM.lo: \ @@ -1062,13 +1135,15 @@ H5O.lo: \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5Ipublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ + $(srcdir)/H5Fpkg.h \ $(srcdir)/H5FLprivate.h \ $(srcdir)/H5Iprivate.h \ $(srcdir)/H5MFprivate.h \ + $(srcdir)/H5FDprivate.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5Gprivate.h \ @@ -1081,14 +1156,14 @@ H5O.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ $(srcdir)/H5Pprivate.h \ $(srcdir)/H5Ppublic.h \ + $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Dprivate.h \ + $(srcdir)/H5Sprivate.h \ $(srcdir)/H5FDmpio.h H5Oattr.lo: \ $(srcdir)/H5Oattr.c \ @@ -1108,10 +1183,10 @@ H5Oattr.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ @@ -1120,14 +1195,15 @@ H5Oattr.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ $(srcdir)/H5Apkg.h \ $(srcdir)/H5Aprivate.h \ - $(srcdir)/H5Apublic.h + $(srcdir)/H5Apublic.h \ + $(srcdir)/H5Sprivate.h \ + $(srcdir)/H5Dpublic.h \ + $(srcdir)/H5Spkg.h H5Ocomp.lo: \ $(srcdir)/H5Ocomp.c \ $(srcdir)/H5private.h \ @@ -1158,9 +1234,7 @@ H5Ocomp.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h H5Ocont.lo: \ @@ -1192,9 +1266,7 @@ H5Ocont.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h H5Odtype.lo: \ @@ -1215,10 +1287,10 @@ H5Odtype.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ @@ -1227,12 +1299,13 @@ H5Odtype.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ - $(srcdir)/H5Tpkg.h + $(srcdir)/H5Tpkg.h \ + $(srcdir)/H5Dprivate.h \ + $(srcdir)/H5Dpublic.h \ + $(srcdir)/H5Sprivate.h H5Oefl.lo: \ $(srcdir)/H5Oefl.c \ $(srcdir)/H5private.h \ @@ -1243,13 +1316,14 @@ H5Oefl.lo: \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ $(srcdir)/H5Ipublic.h \ - $(srcdir)/H5HLprivate.h \ - $(srcdir)/H5HLpublic.h \ + $(srcdir)/H5Fpkg.h \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ + $(srcdir)/H5HLprivate.h \ + $(srcdir)/H5HLpublic.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5Gprivate.h \ @@ -1264,9 +1338,7 @@ H5Oefl.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h H5Ofill.lo: \ @@ -1299,14 +1371,14 @@ H5Ofill.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ $(srcdir)/H5Pprivate.h \ $(srcdir)/H5Ppublic.h \ - $(srcdir)/H5Dprivate.h + $(srcdir)/H5Dpublic.h \ + $(srcdir)/H5Dprivate.h \ + $(srcdir)/H5Sprivate.h H5Olayout.lo: \ $(srcdir)/H5Olayout.c \ $(srcdir)/H5private.h \ @@ -1320,13 +1392,13 @@ H5Olayout.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ @@ -1335,10 +1407,10 @@ H5Olayout.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ $(srcdir)/H5FLprivate.h \ @@ -1373,9 +1445,7 @@ H5Omtime.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h H5Oname.lo: \ @@ -1407,9 +1477,7 @@ H5Oname.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h H5Onull.lo: \ @@ -1425,7 +1493,6 @@ H5Onull.lo: \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5Ipublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ @@ -1438,9 +1505,7 @@ H5Onull.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h H5Osdspace.lo: \ @@ -1461,10 +1526,10 @@ H5Osdspace.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ @@ -1473,11 +1538,12 @@ H5Osdspace.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Zprivate.h \ - $(srcdir)/H5Zpublic.h + $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Spkg.h \ + $(srcdir)/H5Sprivate.h \ + $(srcdir)/H5Dpublic.h H5Oshared.lo: \ $(srcdir)/H5Oshared.c \ $(srcdir)/H5private.h \ @@ -1507,9 +1573,7 @@ H5Oshared.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h H5Ostab.lo: \ @@ -1530,10 +1594,10 @@ H5Ostab.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ @@ -1542,9 +1606,7 @@ H5Ostab.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h H5P.lo: \ @@ -1561,13 +1623,13 @@ H5P.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ $(srcdir)/H5Dprivate.h \ $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ @@ -1576,10 +1638,10 @@ H5P.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ $(srcdir)/H5FDprivate.h \ @@ -1602,13 +1664,13 @@ H5R.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ @@ -1617,12 +1679,13 @@ H5R.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ + $(srcdir)/H5Fpkg.h \ $(srcdir)/H5MMprivate.h H5S.lo: \ $(srcdir)/H5S.c \ @@ -1655,11 +1718,12 @@ H5S.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Zprivate.h \ - $(srcdir)/H5Zpublic.h + $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Spkg.h \ + $(srcdir)/H5Sprivate.h \ + $(srcdir)/H5Dpublic.h H5Sall.lo: \ $(srcdir)/H5Sall.c \ $(srcdir)/H5private.h \ @@ -1671,21 +1735,21 @@ H5Sall.lo: \ $(srcdir)/H5Epublic.h \ $(srcdir)/H5Ipublic.h \ $(srcdir)/H5Iprivate.h \ + $(srcdir)/H5Spkg.h \ $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ + $(srcdir)/H5Oprivate.h \ + $(srcdir)/H5Opublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ - $(srcdir)/H5Oprivate.h \ - $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ $(srcdir)/H5HGpublic.h \ $(srcdir)/H5Tprivate.h \ @@ -1695,7 +1759,8 @@ H5Sall.lo: \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ $(srcdir)/H5Vprivate.h \ - $(srcdir)/H5Dprivate.h + $(srcdir)/H5Dprivate.h \ + $(srcdir)/H5MMpublic.h H5Shyper.lo: \ $(srcdir)/H5Shyper.c \ $(srcdir)/H5private.h \ @@ -1709,13 +1774,13 @@ H5Shyper.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ @@ -1724,10 +1789,10 @@ H5Shyper.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ $(srcdir)/H5FLprivate.h \ @@ -1735,6 +1800,7 @@ H5Shyper.lo: \ $(srcdir)/H5MMprivate.h \ $(srcdir)/H5Pprivate.h \ $(srcdir)/H5Ppublic.h \ + $(srcdir)/H5Spkg.h \ $(srcdir)/H5Vprivate.h H5Smpio.lo: \ $(srcdir)/H5Smpio.c \ @@ -1746,22 +1812,22 @@ H5Smpio.lo: \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ $(srcdir)/H5Ipublic.h \ - $(srcdir)/H5FDprivate.h \ + $(srcdir)/H5Fpkg.h \ + $(srcdir)/H5Fprivate.h \ + $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ + $(srcdir)/H5Spkg.h \ $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Dpublic.h \ - $(srcdir)/H5Fprivate.h \ - $(srcdir)/H5Fpublic.h \ - $(srcdir)/H5MMpublic.h \ + $(srcdir)/H5Oprivate.h \ + $(srcdir)/H5Opublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ - $(srcdir)/H5Oprivate.h \ - $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ $(srcdir)/H5HGpublic.h \ $(srcdir)/H5Tprivate.h \ @@ -1782,21 +1848,21 @@ H5Snone.lo: \ $(srcdir)/H5Epublic.h \ $(srcdir)/H5Ipublic.h \ $(srcdir)/H5Iprivate.h \ + $(srcdir)/H5Spkg.h \ $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ + $(srcdir)/H5Oprivate.h \ + $(srcdir)/H5Opublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ - $(srcdir)/H5Oprivate.h \ - $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ $(srcdir)/H5HGpublic.h \ $(srcdir)/H5Tprivate.h \ @@ -1806,7 +1872,8 @@ H5Snone.lo: \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ $(srcdir)/H5Vprivate.h \ - $(srcdir)/H5Dprivate.h + $(srcdir)/H5Dprivate.h \ + $(srcdir)/H5MMpublic.h H5Spoint.lo: \ $(srcdir)/H5Spoint.c \ $(srcdir)/H5private.h \ @@ -1820,20 +1887,21 @@ H5Spoint.lo: \ $(srcdir)/H5Iprivate.h \ $(srcdir)/H5MMprivate.h \ $(srcdir)/H5MMpublic.h \ + $(srcdir)/H5Spkg.h \ $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ + $(srcdir)/H5Oprivate.h \ + $(srcdir)/H5Opublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ - $(srcdir)/H5Oprivate.h \ - $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ $(srcdir)/H5HGpublic.h \ $(srcdir)/H5Tprivate.h \ @@ -1858,20 +1926,21 @@ H5Sselect.lo: \ $(srcdir)/H5Iprivate.h \ $(srcdir)/H5MMprivate.h \ $(srcdir)/H5MMpublic.h \ + $(srcdir)/H5Spkg.h \ $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ + $(srcdir)/H5Oprivate.h \ + $(srcdir)/H5Opublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ - $(srcdir)/H5Oprivate.h \ - $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ $(srcdir)/H5HGpublic.h \ $(srcdir)/H5Tprivate.h \ @@ -1894,13 +1963,13 @@ H5T.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ $(srcdir)/H5HGprivate.h \ @@ -1909,10 +1978,10 @@ H5T.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Iprivate.h \ $(srcdir)/H5Eprivate.h \ $(srcdir)/H5Epublic.h \ @@ -1938,17 +2007,25 @@ H5Tbit.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ - $(srcdir)/H5Rprivate.h \ - $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Tprivate.h \ - $(srcdir)/H5Tpublic.h \ + $(srcdir)/H5Dprivate.h \ + $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5ACprivate.h \ - $(srcdir)/H5ACpublic.h + $(srcdir)/H5ACpublic.h \ + $(srcdir)/H5MMpublic.h \ + $(srcdir)/H5Oprivate.h \ + $(srcdir)/H5Opublic.h \ + $(srcdir)/H5Tprivate.h \ + $(srcdir)/H5Tpublic.h \ + $(srcdir)/H5Rprivate.h \ + $(srcdir)/H5Rpublic.h \ + $(srcdir)/H5Spublic.h \ + $(srcdir)/H5Zprivate.h \ + $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Sprivate.h H5Tconv.lo: \ $(srcdir)/H5Tconv.c \ $(srcdir)/H5Iprivate.h \ @@ -1985,9 +2062,9 @@ H5Tconv.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Zprivate.h \ + $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Tpkg.h H5Tinit.lo: \ H5Tinit.c \ @@ -2009,16 +2086,24 @@ H5Tinit.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5Rprivate.h \ - $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Tprivate.h \ - $(srcdir)/H5Tpublic.h \ + $(srcdir)/H5Dprivate.h \ + $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5ACprivate.h \ - $(srcdir)/H5ACpublic.h + $(srcdir)/H5ACpublic.h \ + $(srcdir)/H5Oprivate.h \ + $(srcdir)/H5Opublic.h \ + $(srcdir)/H5Tprivate.h \ + $(srcdir)/H5Tpublic.h \ + $(srcdir)/H5Rprivate.h \ + $(srcdir)/H5Rpublic.h \ + $(srcdir)/H5Spublic.h \ + $(srcdir)/H5Zprivate.h \ + $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Sprivate.h H5Tvlen.lo: \ $(srcdir)/H5Tvlen.c \ $(srcdir)/H5private.h \ @@ -2034,20 +2119,28 @@ H5Tvlen.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Iprivate.h \ $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Tpkg.h \ - $(srcdir)/H5Rprivate.h \ - $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Tprivate.h \ - $(srcdir)/H5Tpublic.h \ + $(srcdir)/H5Dprivate.h \ + $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5ACprivate.h \ - $(srcdir)/H5ACpublic.h + $(srcdir)/H5ACpublic.h \ + $(srcdir)/H5Oprivate.h \ + $(srcdir)/H5Opublic.h \ + $(srcdir)/H5Tprivate.h \ + $(srcdir)/H5Tpublic.h \ + $(srcdir)/H5Rprivate.h \ + $(srcdir)/H5Rpublic.h \ + $(srcdir)/H5Spublic.h \ + $(srcdir)/H5Zprivate.h \ + $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Sprivate.h H5TB.lo: \ $(srcdir)/H5TB.c \ $(srcdir)/H5private.h \ @@ -2089,7 +2182,6 @@ H5V.lo: \ $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5MMpublic.h \ $(srcdir)/H5Gprivate.h \ $(srcdir)/H5Gpublic.h \ $(srcdir)/H5Bprivate.h \ @@ -2102,9 +2194,7 @@ H5V.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h \ $(srcdir)/H5Vprivate.h @@ -2137,9 +2227,7 @@ H5Z.lo: \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ - $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Zprivate.h \ $(srcdir)/H5Zpublic.h H5Zdeflate.lo: \ diff --git a/src/H5.c b/src/H5.c index 5bcb5df..7fe293d 100644 --- a/src/H5.c +++ b/src/H5.c @@ -13,26 +13,26 @@ /* $Id$ */ /* private headers */ -#include /*library */ -#include /*B-link trees */ -#include /*datasets */ -#include /*error handling */ -#include /*file driver */ -#include /*Free Lists */ -#include /*atoms */ -#include /*memory management */ -#include /*property lists */ -#include /*references */ -#include /*data spaces */ -#include /*data types */ -#include /*filters */ +#include "H5private.h" /*library */ +#include "H5Bprivate.h" /*B-link trees */ +#include "H5Dprivate.h" /*datasets */ +#include "H5Eprivate.h" /*error handling */ +#include "H5FDprivate.h" /*file driver */ +#include "H5FLprivate.h" /*Free Lists */ +#include "H5Iprivate.h" /*atoms */ +#include "H5MMprivate.h" /*memory management */ +#include "H5Pprivate.h" /*property lists */ +#include "H5Rpublic.h" /*references */ +#include "H5Sprivate.h" /*data spaces */ +#include "H5Tprivate.h" /*data types */ +#include "H5Zprivate.h" /*filters */ /* datatypes of predefined drivers needed by H5_trace() */ -#include +#include "H5FDmpio.h" /* we need this for the struct rusage declaration */ #if defined(H5_HAVE_GETRUSAGE) && defined(linux) -#include +# include #endif /* We need this on Irix64 even though we've included stdio.h as documented */ diff --git a/src/H5A.c b/src/H5A.c index 1d63594..9f6442a 100644 --- a/src/H5A.c +++ b/src/H5A.c @@ -16,18 +16,18 @@ #define H5S_PACKAGE /*suppress error about including H5Spkg */ /* Private header files */ -#include /* Generic Functions */ -#include /* IDs */ -#include /* B-tree subclass names */ -#include /* Datasets */ -#include /* Groups */ -#include /* Datatypes */ -#include /* Error handling */ -#include /* Memory management */ -#include /* Property lists */ -#include /* Object Headers */ -#include /* Data-space functions */ -#include /* Attributes */ +#include "H5private.h" /* Generic Functions */ +#include "H5Iprivate.h" /* IDs */ +#include "H5Bprivate.h" /* B-tree subclass names */ +#include "H5Dprivate.h" /* Datasets */ +#include "H5Gprivate.h" /* Groups */ +#include "H5Tprivate.h" /* Datatypes */ +#include "H5Eprivate.h" /* Error handling */ +#include "H5MMprivate.h" /* Memory management */ +#include "H5Pprivate.h" /* Property lists */ +#include "H5Oprivate.h" /* Object Headers */ +#include "H5Spkg.h" /* Data-space functions */ +#include "H5Apkg.h" /* Attributes */ #define PABLO_MASK H5A_mask diff --git a/src/H5AC.c b/src/H5AC.c index 09eaded..6c7d20e 100644 --- a/src/H5AC.c +++ b/src/H5AC.c @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -26,12 +26,12 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#include -#include -#include -#include -#include /*Free Lists */ -#include +#include "H5private.h" +#include "H5ACprivate.h" +#include "H5Eprivate.h" +#include "H5Fpkg.h" +#include "H5FLprivate.h" /*Free Lists */ +#include "H5MMprivate.h" /* * Sorting the cache by address before flushing is sometimes faster diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h index c9d797b..84fcb8a 100644 --- a/src/H5ACprivate.h +++ b/src/H5ACprivate.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved * *------------------------------------------------------------------------- * @@ -18,11 +18,11 @@ #ifndef _H5ACprivate_H #define _H5ACprivate_H -#include /*public prototypes */ +#include "H5ACpublic.h" /*public prototypes */ /* Pivate headers needed by this header */ -#include -#include +#include "H5private.h" +#include "H5Fprivate.h" /* * Feature: Define H5AC_DEBUG on the compiler command line if you want to diff --git a/src/H5ACpublic.h b/src/H5ACpublic.h index 5f87d1d..208e5c1 100644 --- a/src/H5ACpublic.h +++ b/src/H5ACpublic.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved * *------------------------------------------------------------------------- * @@ -18,7 +18,7 @@ #define _H5ACpublic_H /* Public headers needed by this file */ -#include +#include "H5public.h" #ifdef __cplusplus extern "C" { diff --git a/src/H5Apkg.h b/src/H5Apkg.h index c5497a2..da36b4b 100644 --- a/src/H5Apkg.h +++ b/src/H5Apkg.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 1997 NCSA - * All rights reserved. + * Copyright (C) 1997-2001 NCSA + * All rights reserved. * * Programmer: Quincey Koziol * Monday, Apr 20 @@ -23,9 +23,9 @@ # undef H5A_DEBUG #endif -#include -#include -#include +#include "H5Aprivate.h" +#include "H5HGprivate.h" +#include "H5Sprivate.h" struct H5A_t { uintn initialized;/* Indicate whether the attribute has been modified */ diff --git a/src/H5Aprivate.h b/src/H5Aprivate.h index 49ca7d7..9c24515 100644 --- a/src/H5Aprivate.h +++ b/src/H5Aprivate.h @@ -16,8 +16,8 @@ #ifndef _H5Aprivate_H #define _H5Aprivate_H -#include -#include +#include "H5Apublic.h" +#include "H5Gprivate.h" #define H5A_RESERVED_ATOMS 0 typedef struct H5A_t H5A_t; diff --git a/src/H5Apublic.h b/src/H5Apublic.h index 809a4a3..cb20061 100644 --- a/src/H5Apublic.h +++ b/src/H5Apublic.h @@ -17,7 +17,7 @@ #define _H5Apublic_H /* Public headers needed by this file */ -#include +#include "H5Ipublic.h" #ifdef __cplusplus extern "C" { diff --git a/src/H5B.c b/src/H5B.c index 1bc3f94..1531ded 100644 --- a/src/H5B.c +++ b/src/H5B.c @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -90,17 +90,17 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ /* private headers */ -#include /*library */ -#include /*cache */ -#include /*B-link trees */ -#include /*error handling */ -#include /*file access */ -#include /*Free Lists */ -#include /*file memory management */ -#include /*core memory management */ -#include /*property lists */ - -#include /*for H5FD_mpio_tas_allsame() */ +#include "H5private.h" /*library */ +#include "H5ACprivate.h" /*cache */ +#include "H5Bprivate.h" /*B-link trees */ +#include "H5Eprivate.h" /*error handling */ +#include "H5Fpkg.h" /*file access */ +#include "H5FLprivate.h" /*Free Lists */ +#include "H5MFprivate.h" /*file memory management */ +#include "H5MMprivate.h" /*core memory management */ +#include "H5Pprivate.h" /*property lists */ + +#include "H5FDmpio.h" /*for H5FD_mpio_tas_allsame() */ #define PABLO_MASK H5B_mask diff --git a/src/H5Bprivate.h b/src/H5Bprivate.h index 7effb7f..a8d0139 100644 --- a/src/H5Bprivate.h +++ b/src/H5Bprivate.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -17,12 +17,12 @@ #ifndef _H5Bprivate_H #define _H5Bprivate_H -#include /*API prototypes */ +#include "H5Bpublic.h" /*API prototypes */ /* Private headers needed by this file */ -#include -#include -#include /*cache */ +#include "H5private.h" +#include "H5Fprivate.h" +#include "H5ACprivate.h" /*cache */ /* * Feature: Define this constant if you want to check B-tree consistency diff --git a/src/H5Bpublic.h b/src/H5Bpublic.h index aab279f..fec9a51 100644 --- a/src/H5Bpublic.h +++ b/src/H5Bpublic.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -18,7 +18,7 @@ #define _H5Bpublic_H /* Public headers needed by this file */ -#include +#include "H5public.h" #ifdef __cplusplus extern "C" { diff --git a/src/H5D.c b/src/H5D.c index c6b3e3b..8aef16f 100644 --- a/src/H5D.c +++ b/src/H5D.c @@ -12,30 +12,30 @@ /* $Id$ */ -#include /* Generic Functions */ -#include /* IDs */ -#include /* Dataset functions */ -#include /* Error handling */ -#include /*Free Lists */ -#include /* Group headers */ -#include /* Name heap */ -#include /* Memory management */ -#include /* Object headers */ -#include /* Property lists */ -#include /* Dataspace functions rky 980813 */ -#include /* Vector and array functions */ -#include /* Data filters */ +#include "H5private.h" /* Generic Functions */ +#include "H5Iprivate.h" /* IDs */ +#include "H5Dprivate.h" /* Dataset functions */ +#include "H5Eprivate.h" /* Error handling */ +#include "H5FLprivate.h" /*Free Lists */ +#include "H5Gprivate.h" /* Group headers */ +#include "H5HLprivate.h" /* Name heap */ +#include "H5MMprivate.h" /* Memory management */ +#include "H5Oprivate.h" /* Object headers */ +#include "H5Pprivate.h" /* Property lists */ +#include "H5Sprivate.h" /* Dataspace functions rky 980813 */ +#include "H5Vprivate.h" /* Vector and array functions */ +#include "H5Zprivate.h" /* Data filters */ /* * The MPIO driver is needed because there are kludges in this file and * places where we check for things that aren't handled by this driver. */ -#include +#include "H5FDmpio.h" #ifdef H5_HAVE_PARALLEL /* Remove this if H5R_DATASET_REGION is no longer used in this file */ -#include +# include "H5Rpublic.h" #endif #define PABLO_MASK H5D_mask diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c index b1dad47..ce5d096 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2000 NCSA - * All rights reserved. + * Copyright (C) 2000-2001 NCSA + * All rights reserved. * * Programmer: Quincey Koziol * Thursday, September 28, 2000 @@ -14,11 +14,11 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#include -#include -#include -#include /*file driver */ -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5Fpkg.h" +#include "H5FDprivate.h" /*file driver */ +#include "H5MMprivate.h" /* Interface initialization */ #define PABLO_MASK H5Fcontig_mask diff --git a/src/H5Distore.c b/src/H5Distore.c index 8b98743..44414f3 100644 --- a/src/H5Distore.c +++ b/src/H5Distore.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1997 NCSA - * All rights reserved. + * Copyright (C) 1997-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Wednesday, October 8, 1997 @@ -32,20 +32,20 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#include -#include -#include -#include -#include /*Free Lists */ -#include -#include -#include -#include -#include -#include +#include "H5private.h" +#include "H5Dprivate.h" +#include "H5Eprivate.h" +#include "H5Fpkg.h" +#include "H5FLprivate.h" /*Free Lists */ +#include "H5Iprivate.h" +#include "H5MFprivate.h" +#include "H5MMprivate.h" +#include "H5Oprivate.h" +#include "H5Pprivate.h" +#include "H5Vprivate.h" /* MPIO driver needed for special checks */ -#include +#include "H5FDmpio.h" /* * Feature: If this constant is defined then every cache preemption and load diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h index 7bcb1ae..ebf0f80 100644 --- a/src/H5Dprivate.h +++ b/src/H5Dprivate.h @@ -16,16 +16,16 @@ #ifndef _H5Dprivate_H #define _H5Dprivate_H -#include +#include "H5Dpublic.h" /* Private headers needed by this file */ -#include -#include /*for the H5F_t type */ -#include /*symbol tables */ -#include /*for H5MM_allocate_t and H5MM_free_t types */ -#include /*object Headers */ -#include /*for the H5S_t type */ -#include /*for the H5T_t type */ +#include "H5private.h" +#include "H5Fprivate.h" /*for the H5F_t type */ +#include "H5Gprivate.h" /*symbol tables */ +#include "H5MMpublic.h" /*for H5MM_allocate_t and H5MM_free_t types */ +#include "H5Oprivate.h" /*object Headers */ +#include "H5Sprivate.h" /*for the H5S_t type */ +#include "H5Tprivate.h" /*for the H5T_t type */ /* * Feature: Define H5D_DEBUG on the compiler command line if you want to diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h index 8a6cf93..a4d8b74 100644 --- a/src/H5Dpublic.h +++ b/src/H5Dpublic.h @@ -17,8 +17,8 @@ #define _H5Dpublic_H /* Public headers needed by this file */ -#include -#include +#include "H5public.h" +#include "H5Ipublic.h" /* Values for the H5D_LAYOUT property */ typedef enum H5D_layout_t { diff --git a/src/H5Dseq.c b/src/H5Dseq.c index 602183e..4c77052 100644 --- a/src/H5Dseq.c +++ b/src/H5Dseq.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2000 NCSA - * All rights reserved. + * Copyright (C) 2000-2001 NCSA + * All rights reserved. * * Programmer: Quincey Koziol * Thursday, September 28, 2000 @@ -14,20 +14,20 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#include -#include -#include -#include -#include /*file driver */ -#include -#include -#include /*memory management */ -#include -#include -#include +#include "H5private.h" +#include "H5Dprivate.h" +#include "H5Eprivate.h" +#include "H5Fpkg.h" +#include "H5FDprivate.h" /*file driver */ +#include "H5Iprivate.h" +#include "H5MFprivate.h" +#include "H5MMprivate.h" /*memory management */ +#include "H5Oprivate.h" +#include "H5Pprivate.h" +#include "H5Vprivate.h" /* MPIO driver functions are needed for some special checks */ -#include +#include "H5FDmpio.h" /* Interface initialization */ #define PABLO_MASK H5Fseq_mask diff --git a/src/H5E.c b/src/H5E.c index 11fb11b..33577be 100644 --- a/src/H5E.c +++ b/src/H5E.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1998 NCSA HDF - * All rights reserved. + * Copyright (C) 1998-2001 NCSA HDF + * All rights reserved. * * Purpose: Provides error handling in the form of a stack. The * FUNC_ENTER() macro clears the error stack whenever an API @@ -28,10 +28,10 @@ * errors within the H5E package. * */ -#include /* Generic Functions */ -#include /* IDs */ -#include /* Private error routines */ -#include /* Memory management */ +#include "H5private.h" /* Generic Functions */ +#include "H5Iprivate.h" /* IDs */ +#include "H5Eprivate.h" /* Private error routines */ +#include "H5MMprivate.h" /* Memory management */ #define PABLO_MASK H5E_mask diff --git a/src/H5Eprivate.h b/src/H5Eprivate.h index 49fbc96..6aba456 100644 --- a/src/H5Eprivate.h +++ b/src/H5Eprivate.h @@ -16,10 +16,10 @@ #ifndef _H5Eprivate_H #define _H5Eprivate_H -#include +#include "H5Epublic.h" /* Private headers needed by this file */ -#include +#include "H5private.h" #define H5E_NSLOTS 32 /*number of slots in an error stack */ diff --git a/src/H5Epublic.h b/src/H5Epublic.h index 2335600..f0b59c8 100644 --- a/src/H5Epublic.h +++ b/src/H5Epublic.h @@ -19,8 +19,8 @@ #include /*FILE arg of H5Eprint() */ /* Public headers needed by this file */ -#include -#include +#include "H5public.h" +#include "H5Ipublic.h" /* * One often needs to temporarily disable automatic error reporting when diff --git a/src/H5F.c b/src/H5F.c index 62c16e8..9389e65 100644 --- a/src/H5F.c +++ b/src/H5F.c @@ -19,32 +19,32 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ /* Predefined file drivers */ -#include /*temporary in-memory files */ -#include /*family of files */ -#include /*MPI-2 I/O */ -#include /*GASS I/O */ -#include /*Grid Storage I/O */ -#include /*in-memory files streamed via sockets */ -#include /*SRB I/O */ -#include /*multiple files partitioned by mem usage */ -#include /*Posix unbuffered I/O */ -#include /* Standard C buffered I/O */ -#include /* sec2 driver with logging, for debugging */ +#include "H5FDcore.h" /*temporary in-memory files */ +#include "H5FDfamily.h" /*family of files */ +#include "H5FDmpio.h" /*MPI-2 I/O */ +#include "H5FDgass.h" /*GASS I/O */ +#include "H5FDdpss.h" /*Grid Storage I/O */ +#include "H5FDstream.h" /*in-memory files streamed via sockets */ +#include "H5FDsrb.h" /*SRB I/O */ +#include "H5FDmulti.h" /*multiple files partitioned by mem usage */ +#include "H5FDsec2.h" /*Posix unbuffered I/O */ +#include "H5FDstdio.h" /* Standard C buffered I/O */ +#include "H5FDlog.h" /* sec2 driver with logging, for debugging */ /* Packages needed by this file... */ -#include /*library functions */ -#include /*attributes */ -#include /*datasets */ -#include /*Free Lists */ -#include /*object IDs */ -#include /*cache */ -#include /*error handling */ -#include /*file access */ -#include /*file driver */ -#include /*symbol tables */ -#include /*core memory management */ -#include /*property lists */ -#include /*data types */ +#include "H5private.h" /*library functions */ +#include "H5Aprivate.h" /*attributes */ +#include "H5Dprivate.h" /*datasets */ +#include "H5FLprivate.h" /*Free Lists */ +#include "H5Iprivate.h" /*object IDs */ +#include "H5ACprivate.h" /*cache */ +#include "H5Eprivate.h" /*error handling */ +#include "H5Fpkg.h" /*file access */ +#include "H5FDprivate.h" /*file driver */ +#include "H5Gprivate.h" /*symbol tables */ +#include "H5MMprivate.h" /*core memory management */ +#include "H5Pprivate.h" /*property lists */ +#include "H5Tprivate.h" /*data types */ #define PABLO_MASK H5F_mask diff --git a/src/H5FD.c b/src/H5FD.c index 95241d6..d182cc4 100644 --- a/src/H5FD.c +++ b/src/H5FD.c @@ -1,6 +1,6 @@ /* - * Copyright © 1999 NCSA - * All rights reserved. + * Copyright © 1999-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Monday, July 26, 1999 @@ -15,14 +15,14 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ /* Packages needed by this file */ -#include /*library functions */ -#include /*error handling */ -#include /*files */ -#include /*virtual file driver */ -#include /*Free Lists */ -#include /*interface abstraction layer */ -#include /*memory management */ -#include /*property lists */ +#include "H5private.h" /*library functions */ +#include "H5Eprivate.h" /*error handling */ +#include "H5Fpkg.h" /*files */ +#include "H5FDprivate.h" /*virtual file driver */ +#include "H5FLprivate.h" /*Free Lists */ +#include "H5Iprivate.h" /*interface abstraction layer */ +#include "H5MMprivate.h" /*memory management */ +#include "H5Pprivate.h" /*property lists */ /* Interface initialization */ #define PABLO_MASK H5FD_mask diff --git a/src/H5FDcore.c b/src/H5FDcore.c index ae70cbe..b971237 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -1,6 +1,6 @@ /* - * Copyright © 1999 NCSA - * All rights reserved. + * Copyright © 1999-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Tuesday, August 10, 1999 @@ -9,13 +9,13 @@ * only the HDF5 public API. This driver is useful for fast * access to small, temporary hdf5 files. */ -#include /*library functions */ -#include /*error handling */ -#include /*files */ -#include /*file driver */ -#include /* Core file driver */ -#include /* Memory allocation */ -#include /*property lists */ +#include "H5private.h" /*library functions */ +#include "H5Eprivate.h" /*error handling */ +#include "H5Fprivate.h" /*files */ +#include "H5FDprivate.h" /*file driver */ +#include "H5FDcore.h" /* Core file driver */ +#include "H5MMprivate.h" /* Memory allocation */ +#include "H5Pprivate.h" /*property lists */ #undef MAX #define MAX(X,Y) ((X)>(Y)?(X):(Y)) diff --git a/src/H5FDcore.h b/src/H5FDcore.h index f0d338a..7f002f7 100644 --- a/src/H5FDcore.h +++ b/src/H5FDcore.h @@ -1,6 +1,6 @@ /* - * Copyright © 1999 NCSA - * All rights reserved. + * Copyright © 1999-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Monday, August 2, 1999 @@ -10,7 +10,7 @@ #ifndef H5FDcore_H #define H5FDcore_H -#include +#include "H5Ipublic.h" #define H5FD_CORE (H5FD_core_init()) diff --git a/src/H5FDdpss.c b/src/H5FDdpss.c index cb9518d..cc378d1 100644 --- a/src/H5FDdpss.c +++ b/src/H5FDdpss.c @@ -1,6 +1,6 @@ /* - * Copyright © 1999 NCSA - * All rights reserved. + * Copyright © 1999-2001 NCSA + * All rights reserved. * * Programmer: Thomas Radke * Monday, October 11, 1999 @@ -9,16 +9,16 @@ * */ -#include -#include /* error handling */ -#include /*file driver */ -#include -#include /* memory management */ +#include "hdf5.h" +#include "H5Eprivate.h" /* error handling */ +#include "H5FDprivate.h" /*file driver */ +#include "H5FDdpss.h" +#include "H5MMprivate.h" /* memory management */ #ifdef COALESCE_READS /* Packages needed by this file.*/ -#include -#include +#include "H5Fprivate.h" +#include "H5Iprivate.h" #endif diff --git a/src/H5FDdpss.h b/src/H5FDdpss.h index 82d0313..851956d 100644 --- a/src/H5FDdpss.h +++ b/src/H5FDdpss.h @@ -1,6 +1,6 @@ /* - * Copyright © 1999 NCSA - * All rights reserved. + * Copyright © 1999-2001 NCSA + * All rights reserved. * * Programmer: Thomas Radke * Monday, October 11, 1999 @@ -10,8 +10,8 @@ #ifndef H5FDdpss_H #define H5FDdpss_H -#include /* typedef for herr_t */ -#include /* typedef for hid_t */ +#include "H5public.h" /* typedef for herr_t */ +#include "H5Ipublic.h" /* typedef for hid_t */ #ifdef H5_HAVE_GRIDSTORAGE #define H5FD_DPSS (H5FD_dpss_init()) diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c index cbc0d34..1efce47 100644 --- a/src/H5FDfamily.c +++ b/src/H5FDfamily.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1997 NCSA - * All rights reserved. + * Copyright (C) 1997-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Monday, November 10, 1997 @@ -21,13 +21,13 @@ * implement holes, like nfs). * */ -#include /*library functions */ -#include /*error handling */ -#include /*files */ -#include /*file driver */ -#include /* Family file driver */ -#include /* Memory allocation */ -#include /*property lists */ +#include "H5private.h" /*library functions */ +#include "H5Eprivate.h" /*error handling */ +#include "H5Fprivate.h" /*files */ +#include "H5FDprivate.h" /*file driver */ +#include "H5FDfamily.h" /* Family file driver */ +#include "H5MMprivate.h" /* Memory allocation */ +#include "H5Pprivate.h" /*property lists */ #undef MAX diff --git a/src/H5FDfamily.h b/src/H5FDfamily.h index 98683e2..c8f8481 100644 --- a/src/H5FDfamily.h +++ b/src/H5FDfamily.h @@ -1,6 +1,6 @@ /* - * Copyright © 1999 NCSA - * All rights reserved. + * Copyright © 1999-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Monday, August 4, 1999 @@ -10,7 +10,7 @@ #ifndef H5FDfamily_H #define H5FDfamily_H -#include +#include "H5Ipublic.h" #define H5FD_FAMILY (H5FD_family_init()) diff --git a/src/H5FDgass.c b/src/H5FDgass.c index 6763875..9151440 100644 --- a/src/H5FDgass.c +++ b/src/H5FDgass.c @@ -1,6 +1,6 @@ /* - * Copyright © 1999 NCSA - * All rights reserved. + * Copyright © 1999-2001 NCSA + * All rights reserved. * * Programmer: Saurabh Bagchi (bagchi@uiuc.edu) * Thursday, August 12 -Tuesday, August 17, 1999 @@ -8,13 +8,13 @@ * Purpose: This is the GASS I/O driver. * */ -#include /*library functions */ -#include /*error handling */ -#include /*files */ -#include /*file driver */ -#include /* Core file driver */ -#include /* Memory allocation */ -#include /*property lists */ +#include "H5private.h" /*library functions */ +#include "H5Eprivate.h" /*error handling */ +#include "H5Fprivate.h" /*files */ +#include "H5FDprivate.h" /*file driver */ +#include "H5FDgass.h" /* Core file driver */ +#include "H5MMprivate.h" /* Memory allocation */ +#include "H5Pprivate.h" /*property lists */ #undef MAX diff --git a/src/H5FDgass.h b/src/H5FDgass.h index f1ce6f1..88a4e69 100644 --- a/src/H5FDgass.h +++ b/src/H5FDgass.h @@ -1,6 +1,6 @@ /* - * Copyright © 1999 NCSA - * All rights reserved. + * Copyright © 1999-2001 NCSA + * All rights reserved. * * Programmer: Saurabh Bagchi * Tuesday, August 17, 1999 @@ -10,8 +10,8 @@ #ifndef H5FDgass_H #define H5FDgass_H -#include -#include +#include "H5FDpublic.h" +#include "H5Ipublic.h" #include diff --git a/src/H5FDlog.c b/src/H5FDlog.c index 74e8bde..86b3159 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -1,6 +1,6 @@ /* - * Copyright © 2000 NCSA - * All rights reserved. + * Copyright © 2000-2001 NCSA + * All rights reserved. * * Programmer: Quincey Koziol * Monday, April 17, 2000 @@ -14,14 +14,14 @@ * With custom modifications... */ -#include /*library functions */ -#include /*error handling */ -#include /*files */ -#include /*file driver */ -#include /* logging file driver */ -#include /*Free Lists */ -#include /* Memory allocation */ -#include /*property lists */ +#include "H5private.h" /*library functions */ +#include "H5Eprivate.h" /*error handling */ +#include "H5Fprivate.h" /*files */ +#include "H5FDprivate.h" /*file driver */ +#include "H5FDlog.h" /* logging file driver */ +#include "H5FLprivate.h" /*Free Lists */ +#include "H5MMprivate.h" /* Memory allocation */ +#include "H5Pprivate.h" /*property lists */ #ifdef MAX diff --git a/src/H5FDlog.h b/src/H5FDlog.h index 7db9403..7a2930d 100644 --- a/src/H5FDlog.h +++ b/src/H5FDlog.h @@ -1,6 +1,6 @@ /* - * Copyright © 2000 NCSA - * All rights reserved. + * Copyright © 2000-2001 NCSA + * All rights reserved. * * Programmer: Quincey Koziol * Monday, April 17, 2000 @@ -10,7 +10,7 @@ #ifndef H5FDlog_H #define H5FDlog_H -#include +#include "H5Ipublic.h" #define H5FD_LOG (H5FD_log_init()) diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index ee3ecea..55db611 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -1,6 +1,6 @@ /* - * Copyright © 1999 NCSA - * All rights reserved. + * Copyright © 1999-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Thursday, July 29, 1999 @@ -20,13 +20,13 @@ * bytes read is always equal to the number requested. This * kluge is activated by #ifdef MPI_KLUGE0202. */ -#include /*library functions */ -#include /*error handling */ -#include /*files */ -#include /*file driver */ -#include /* MPI I/O file driver */ -#include /* Memory allocation */ -#include /*property lists */ +#include "H5private.h" /*library functions */ +#include "H5Eprivate.h" /*error handling */ +#include "H5Fprivate.h" /*files */ +#include "H5FDprivate.h" /*file driver */ +#include "H5FDmpio.h" /* MPI I/O file driver */ +#include "H5MMprivate.h" /* Memory allocation */ +#include "H5Pprivate.h" /*property lists */ /* * The driver identification number, initialized at runtime if H5_HAVE_PARALLEL diff --git a/src/H5FDmpio.h b/src/H5FDmpio.h index c0f8068..6296516 100644 --- a/src/H5FDmpio.h +++ b/src/H5FDmpio.h @@ -1,6 +1,6 @@ /* - * Copyright © 1999 NCSA - * All rights reserved. + * Copyright © 1999-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Monday, August 2, 1999 @@ -10,8 +10,8 @@ #ifndef H5FDmpio_H #define H5FDmpio_H -#include -#include +#include "H5FDpublic.h" +#include "H5Ipublic.h" #ifdef H5_HAVE_PARALLEL # define H5FD_MPIO (H5FD_mpio_init()) diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index fd7dfbb..85b5695 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1997 NCSA - * All rights reserved. + * Copyright (C) 1997-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Monday, November 10, 1997 @@ -11,9 +11,10 @@ * place in one file while all raw data goes to some other file. */ #include -#include #include +#include "hdf5.h" + /* * Define H5FD_MULTI_DEBUG if you want the ability to print debugging * messages to the standard error stream. Messages are only printed if the diff --git a/src/H5FDmulti.h b/src/H5FDmulti.h index 6014115..8bd81d5 100644 --- a/src/H5FDmulti.h +++ b/src/H5FDmulti.h @@ -1,6 +1,6 @@ /* - * Copyright © 1999 NCSA - * All rights reserved. + * Copyright © 1999-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Monday, August 2, 1999 @@ -10,7 +10,7 @@ #ifndef H5FDmulti_H #define H5FDmulti_H -#include +#include "H5Ipublic.h" #define H5FD_MULTI (H5FD_multi_init()) diff --git a/src/H5FDprivate.h b/src/H5FDprivate.h index f3ed1d7..d535535 100644 --- a/src/H5FDprivate.h +++ b/src/H5FDprivate.h @@ -1,6 +1,6 @@ /* - * Copyright © 1999 NCSA - * All rights reserved. + * Copyright © 1999-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Monday, July 26, 1999 @@ -8,7 +8,7 @@ #ifndef _H5FDprivate_H #define _H5FDprivate_H -#include +#include "H5FDpublic.h" #define H5FD_has_cmp(id) (NULL!=H5FD_get_class(id)->cmp) diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h index 6a0fb59..91f5393 100644 --- a/src/H5FDpublic.h +++ b/src/H5FDpublic.h @@ -1,6 +1,6 @@ /* - * Copyright © 1999 NCSA - * All rights reserved. + * Copyright © 1999-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Monday, July 26, 1999 @@ -8,7 +8,8 @@ #ifndef _H5FDpublic_H #define _H5FDpublic_H -#include +#include "H5public.h" + #define H5_HAVE_VFL 1 /*define a convenient app feature test*/ #define H5FD_VFD_DEFAULT 0 /* Default VFL driver value */ diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c index ebf4c64..0e731c4 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -1,6 +1,6 @@ /* - * Copyright © 1999 NCSA - * All rights reserved. + * Copyright © 1999-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Thursday, July 29, 1999 @@ -12,14 +12,14 @@ * I/O from this driver with I/O from other parts of the * application to the same file). */ -#include /*library functions */ -#include /*error handling */ -#include /*files */ -#include /*file driver */ -#include /* Sec2 file driver */ -#include /*Free Lists */ -#include /* Memory allocation */ -#include /*property lists */ +#include "H5private.h" /*library functions */ +#include "H5Eprivate.h" /*error handling */ +#include "H5Fprivate.h" /*files */ +#include "H5FDprivate.h" /*file driver */ +#include "H5FDsec2.h" /* Sec2 file driver */ +#include "H5FLprivate.h" /*Free Lists */ +#include "H5MMprivate.h" /* Memory allocation */ +#include "H5Pprivate.h" /*property lists */ #ifdef MAX #undef MAX diff --git a/src/H5FDsec2.h b/src/H5FDsec2.h index 7e58de3..fb7774a 100644 --- a/src/H5FDsec2.h +++ b/src/H5FDsec2.h @@ -1,6 +1,6 @@ /* - * Copyright © 1999 NCSA - * All rights reserved. + * Copyright © 1999-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Monday, August 2, 1999 @@ -10,7 +10,7 @@ #ifndef H5FDsec2_H #define H5FDsec2_H -#include +#include "H5Ipublic.h" #define H5FD_SEC2 (H5FD_sec2_init()) diff --git a/src/H5FDsrb.c b/src/H5FDsrb.c index 09354a5..dadff6a 100644 --- a/src/H5FDsrb.c +++ b/src/H5FDsrb.c @@ -1,19 +1,19 @@ /* - * Copyright 1999 NCSA - * All rights reserved. + * Copyright (c) 1999-2001 NCSA + * All rights reserved. * * Programmer: Raymond Lu * Wednesday, April 12, 2000 * * Purpose: SRB I/O driver. */ -#include /*library functions */ -#include /*error handling */ -#include /*files */ -#include /*file driver */ -#include /* Core file driver */ -#include /* Memory allocation */ -#include /*property lists */ +#include "H5private.h" /*library functions */ +#include "H5Eprivate.h" /*error handling */ +#include "H5Fprivate.h" /*files */ +#include "H5FDprivate.h" /*file driver */ +#include "H5FDsrb.h" /* Core file driver */ +#include "H5MMprivate.h" /* Memory allocation */ +#include "H5Pprivate.h" /*property lists */ /* The driver identification number, initialized at runtime */ diff --git a/src/H5FDsrb.h b/src/H5FDsrb.h index 66358b6..a7e1953 100644 --- a/src/H5FDsrb.h +++ b/src/H5FDsrb.h @@ -1,6 +1,6 @@ /* - * Copyright 1999 NCSA - * All rights reserved. + * Copyright (c) 1999-2001 NCSA + * All rights reserved. * * Programmer: Raymond Lu * Wednesday, April 12, 2000 @@ -9,8 +9,8 @@ #ifndef H5FDsrb_H #define H5FDsrb_H -#include -#include +#include "H5FDpublic.h" +#include "H5Ipublic.h" #ifdef H5_HAVE_SRB diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c index 571e1a4..48c5ba3 100644 --- a/src/H5FDstdio.c +++ b/src/H5FDstdio.c @@ -1,6 +1,6 @@ /* - * Copyright © 1999 NCSA - * All rights reserved. + * Copyright © 1999-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Wednesday, October 22, 1997 @@ -10,7 +10,6 @@ * Notes: Ported to the new H5FD architecture on 10/18/99 - QAK * */ -#include #include #include #include @@ -23,6 +22,8 @@ #include #endif +#include "hdf5.h" + #ifdef MAX #undef MAX #endif /* MAX */ diff --git a/src/H5FDstdio.h b/src/H5FDstdio.h index 7dac8f4..3d7281f 100644 --- a/src/H5FDstdio.h +++ b/src/H5FDstdio.h @@ -1,6 +1,6 @@ /* - * Copyright © 1999 NCSA - * All rights reserved. + * Copyright © 1999-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Monday, August 2, 1999 @@ -10,7 +10,7 @@ #ifndef H5FDstdio_H #define H5FDstdio_H -#include +#include "H5Ipublic.h" #define H5FD_STDIO (H5FD_stdio_init()) diff --git a/src/H5FDstream.c b/src/H5FDstream.c index 48a4edd..924ab9e 100644 --- a/src/H5FDstream.c +++ b/src/H5FDstream.c @@ -21,17 +21,17 @@ * */ -#include /* H5_HAVE_STREAM */ +#include "H5public.h" /* H5_HAVE_STREAM */ /* Only build this driver if it was configured with --with-Stream-VFD */ #ifdef H5_HAVE_STREAM -#include /* error handling */ -#include /* VFD structures */ -#include /* memory allocation */ -#include /* files */ -#include /* VFD prototypes */ -#include /* Stream VFD header */ +#include "H5Eprivate.h" /* error handling */ +#include "H5FDpublic.h" /* VFD structures */ +#include "H5MMprivate.h" /* memory allocation */ +#include "H5Ppublic.h" /* files */ +#include "H5Pprivate.h" /* VFD prototypes */ +#include "H5FDstream.h" /* Stream VFD header */ #ifdef H5FD_STREAM_HAVE_UNIX_SOCKETS #ifdef H5_HAVE_SYS_TYPES_H diff --git a/src/H5FDstream.h b/src/H5FDstream.h index ec0dc17..9276cc4 100644 --- a/src/H5FDstream.h +++ b/src/H5FDstream.h @@ -20,7 +20,7 @@ #ifdef H5_HAVE_STREAM -#include +#include "H5Ipublic.h" /* check what sockets type we have (Unix or Windows sockets) Note that only MS compilers require to use Windows sockets diff --git a/src/H5FL.c b/src/H5FL.c index f25c68f..e5c104b 100644 --- a/src/H5FL.c +++ b/src/H5FL.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2000 NCSA - * All rights reserved. + * Copyright (C) 2000-2001 NCSA + * All rights reserved. * * Programmer: Quincey Koziol * Thursday, March 23, 2000 @@ -17,10 +17,10 @@ /* #define H5FL_DEBUG */ -#include /*library */ -#include /*error handling */ -#include /*Core memory management */ -#include /*Priority queues */ +#include "H5private.h" /*library */ +#include "H5Eprivate.h" /*error handling */ +#include "H5MMprivate.h" /*Core memory management */ +#include "H5FLprivate.h" /*Priority queues */ #define PABLO_MASK H5FL_mask static intn interface_initialize_g = 0; diff --git a/src/H5FLprivate.h b/src/H5FLprivate.h index 50315ed..b8835db 100644 --- a/src/H5FLprivate.h +++ b/src/H5FLprivate.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 2000 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 2000-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -19,7 +19,7 @@ /* Public headers needed by this file */ #ifdef LATER -#include /*API prototypes */ +#include "H5FLpublic.h" /*API prototypes */ #endif /* LATER */ /* Private headers needed by this file */ diff --git a/src/H5Farray.c b/src/H5Farray.c index 2c7c9d8..e2e71ab 100644 --- a/src/H5Farray.c +++ b/src/H5Farray.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Thursday, January 15, 1998 @@ -14,20 +14,20 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#include -#include -#include -#include -#include /*file driver */ -#include -#include -#include /*memory management */ -#include -#include -#include +#include "H5private.h" +#include "H5Dprivate.h" +#include "H5Eprivate.h" +#include "H5Fpkg.h" +#include "H5FDprivate.h" /*file driver */ +#include "H5Iprivate.h" +#include "H5MFprivate.h" +#include "H5MMprivate.h" /*memory management */ +#include "H5Oprivate.h" +#include "H5Pprivate.h" +#include "H5Vprivate.h" /* MPIO driver functions are needed for some special checks */ -#include +#include "H5FDmpio.h" /* Interface initialization */ #define PABLO_MASK H5Farray_mask diff --git a/src/H5Fcontig.c b/src/H5Fcontig.c index b1dad47..ce5d096 100644 --- a/src/H5Fcontig.c +++ b/src/H5Fcontig.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2000 NCSA - * All rights reserved. + * Copyright (C) 2000-2001 NCSA + * All rights reserved. * * Programmer: Quincey Koziol * Thursday, September 28, 2000 @@ -14,11 +14,11 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#include -#include -#include -#include /*file driver */ -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5Fpkg.h" +#include "H5FDprivate.h" /*file driver */ +#include "H5MMprivate.h" /* Interface initialization */ #define PABLO_MASK H5Fcontig_mask diff --git a/src/H5Fistore.c b/src/H5Fistore.c index 8b98743..44414f3 100644 --- a/src/H5Fistore.c +++ b/src/H5Fistore.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1997 NCSA - * All rights reserved. + * Copyright (C) 1997-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Wednesday, October 8, 1997 @@ -32,20 +32,20 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#include -#include -#include -#include -#include /*Free Lists */ -#include -#include -#include -#include -#include -#include +#include "H5private.h" +#include "H5Dprivate.h" +#include "H5Eprivate.h" +#include "H5Fpkg.h" +#include "H5FLprivate.h" /*Free Lists */ +#include "H5Iprivate.h" +#include "H5MFprivate.h" +#include "H5MMprivate.h" +#include "H5Oprivate.h" +#include "H5Pprivate.h" +#include "H5Vprivate.h" /* MPIO driver needed for special checks */ -#include +#include "H5FDmpio.h" /* * Feature: If this constant is defined then every cache preemption and load diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h index d417b76..3c7c142 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2000 NCSA - * All rights reserved. + * Copyright (C) 2000-2001 NCSA + * All rights reserved. * * Programmer: Quincey Koziol * Thursday, September 28, 2000 @@ -16,10 +16,10 @@ #ifndef _H5Fpkg_H #define _H5Fpkg_H -#include +#include "H5Fprivate.h" /* This is a near top-level header! Try not to include much! */ -#include +#include "H5private.h" /* * Feature: Define this constant to be non-zero if you want to enable code diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 09ed4c7..26412a7 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -19,10 +19,10 @@ #ifndef _H5Fprivate_H #define _H5Fprivate_H -#include +#include "H5Fpublic.h" /* This is a near top-level header! Try not to include much! */ -#include /*file drivers */ +#include "H5FDpublic.h" /*file drivers */ typedef struct H5F_t H5F_t; diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index 4174f0c..3c03084 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -17,8 +17,8 @@ #define _H5Fpublic_H /* Public header files needed by this file */ -#include -#include +#include "H5public.h" +#include "H5Ipublic.h" /* * These are the bits that can be passed to the `flags' argument of diff --git a/src/H5Fseq.c b/src/H5Fseq.c index 602183e..4c77052 100644 --- a/src/H5Fseq.c +++ b/src/H5Fseq.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2000 NCSA - * All rights reserved. + * Copyright (C) 2000-2001 NCSA + * All rights reserved. * * Programmer: Quincey Koziol * Thursday, September 28, 2000 @@ -14,20 +14,20 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#include -#include -#include -#include -#include /*file driver */ -#include -#include -#include /*memory management */ -#include -#include -#include +#include "H5private.h" +#include "H5Dprivate.h" +#include "H5Eprivate.h" +#include "H5Fpkg.h" +#include "H5FDprivate.h" /*file driver */ +#include "H5Iprivate.h" +#include "H5MFprivate.h" +#include "H5MMprivate.h" /*memory management */ +#include "H5Oprivate.h" +#include "H5Pprivate.h" +#include "H5Vprivate.h" /* MPIO driver functions are needed for some special checks */ -#include +#include "H5FDmpio.h" /* Interface initialization */ #define PABLO_MASK H5Fseq_mask diff --git a/src/H5G.c b/src/H5G.c index 4b5efe4..ffa9021 100644 --- a/src/H5G.c +++ b/src/H5G.c @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -77,18 +77,18 @@ /* Packages needed by this file... */ -#include -#include -#include -#include -#include -#include /*file access */ -#include /*Free Lists */ -#include -#include -#include -#include -#include +#include "H5private.h" +#include "H5Aprivate.h" +#include "H5Bprivate.h" +#include "H5Dprivate.h" +#include "H5Eprivate.h" +#include "H5Fpkg.h" /*file access */ +#include "H5FLprivate.h" /*Free Lists */ +#include "H5Gpkg.h" +#include "H5HLprivate.h" +#include "H5Iprivate.h" +#include "H5MMprivate.h" +#include "H5Oprivate.h" #define H5G_INIT_HEAP 8192 #define H5G_RESERVED_ATOMS 0 diff --git a/src/H5Gent.c b/src/H5Gent.c index a9816db..a5d1bca 100644 --- a/src/H5Gent.c +++ b/src/H5Gent.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * * Programmer: Robb Matzke * Friday, September 19, 1997 @@ -8,12 +8,12 @@ #define H5G_PACKAGE #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#include -#include -#include -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5Fpkg.h" +#include "H5Gpkg.h" +#include "H5HLprivate.h" +#include "H5MMprivate.h" #define PABLO_MASK H5G_ent_mask static intn interface_initialize_g = 0; diff --git a/src/H5Gnode.c b/src/H5Gnode.c index eaf3115..90a7c79 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -21,20 +21,20 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ /* Packages needed by this file... */ -#include /*library */ -#include /*cache */ -#include /*B-link trees */ -#include /*error handling */ -#include /*file access */ -#include /*Free Lists */ -#include /*me */ -#include /*local heap */ -#include /*file memory management */ -#include /*core memory management */ -#include /*header messages */ -#include /*property lists */ - -#include /*the MPIO file driver */ +#include "H5private.h" /*library */ +#include "H5ACprivate.h" /*cache */ +#include "H5Bprivate.h" /*B-link trees */ +#include "H5Eprivate.h" /*error handling */ +#include "H5Fpkg.h" /*file access */ +#include "H5FLprivate.h" /*Free Lists */ +#include "H5Gpkg.h" /*me */ +#include "H5HLprivate.h" /*local heap */ +#include "H5MFprivate.h" /*file memory management */ +#include "H5MMprivate.h" /*core memory management */ +#include "H5Oprivate.h" /*header messages */ +#include "H5Pprivate.h" /*property lists */ + +#include "H5FDmpio.h" /*the MPIO file driver */ #define PABLO_MASK H5G_node_mask diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h index aa0b981..8a2c305 100644 --- a/src/H5Gpkg.h +++ b/src/H5Gpkg.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * * Programmer: Robb Matzke * Thursday, September 18, 1997 @@ -16,8 +16,8 @@ #ifndef _H5Gpkg_H #define _H5Gpkg_H -#include -#include +#include "H5ACprivate.h" +#include "H5Gprivate.h" #define H5G_NODE_VERS 1 /*symbol table node version number */ #define H5G_SIZE_HINT 1024 /*default root grp size hint */ diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h index d777c79..5996be6 100644 --- a/src/H5Gprivate.h +++ b/src/H5Gprivate.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -17,12 +17,12 @@ #ifndef _H5Gprivate_H #define _H5Gprivate_H -#include +#include "H5Gpublic.h" /* Private headers needed by this file */ -#include -#include -#include +#include "H5private.h" +#include "H5Bprivate.h" +#include "H5Fprivate.h" /* * Define this to enable debugging. diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h index 378ef2c..2071b26 100644 --- a/src/H5Gpublic.h +++ b/src/H5Gpublic.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -20,8 +20,9 @@ /* Public headers needed by this file */ #include -#include -#include + +#include "H5public.h" +#include "H5Ipublic.h" #ifdef __cplusplus extern "C" { diff --git a/src/H5Gstab.c b/src/H5Gstab.c index c486718..b402737 100644 --- a/src/H5Gstab.c +++ b/src/H5Gstab.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1997 National Center for Supercomputing Applications - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * * Programmer: Robb Matzke * Friday, September 19, 1997 @@ -9,13 +9,13 @@ #define H5G_PACKAGE #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#include -#include -#include /*file access */ -#include -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5Fpkg.h" /*file access */ +#include "H5Gpkg.h" +#include "H5HLprivate.h" +#include "H5MMprivate.h" +#include "H5Oprivate.h" #define PABLO_MASK H5G_stab_mask static intn interface_initialize_g = 0; diff --git a/src/H5HG.c b/src/H5HG.c index 15655db..b57b08f 100644 --- a/src/H5HG.c +++ b/src/H5HG.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Friday, March 27, 1998 @@ -26,15 +26,15 @@ */ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#include /*library */ -#include /*caching */ -#include /*error handling */ -#include /*file access */ -#include /*Free Lists */ -#include /*global heaps */ -#include /*file memory management */ -#include /*core memory management */ -#include /*property lists */ +#include "H5private.h" /*library */ +#include "H5ACprivate.h" /*caching */ +#include "H5Eprivate.h" /*error handling */ +#include "H5Fpkg.h" /*file access */ +#include "H5FLprivate.h" /*Free Lists */ +#include "H5HGprivate.h" /*global heaps */ +#include "H5MFprivate.h" /*file memory management */ +#include "H5MMprivate.h" /*core memory management */ +#include "H5Pprivate.h" /*property lists */ #define PABLO_MASK H5HG_mask diff --git a/src/H5HGprivate.h b/src/H5HGprivate.h index c46000e..a6d02fa 100644 --- a/src/H5HGprivate.h +++ b/src/H5HGprivate.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Friday, March 27, 1998 @@ -8,9 +8,8 @@ #ifndef _H5HGprivate_H #define _H5HGprivate_H -#include - -#include +#include "H5HGpublic.h" +#include "H5Fprivate.h" /* * Each collection has a magic number for some redundancy. diff --git a/src/H5HGpublic.h b/src/H5HGpublic.h index 0c561e3..8b9c5f5 100644 --- a/src/H5HGpublic.h +++ b/src/H5HGpublic.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Friday, March 27, 1998 @@ -9,7 +9,7 @@ #define _H5HGpublic_H /* Public headers needed by this file */ -#include +#include "H5public.h" #ifdef __cplusplus extern "C" { diff --git a/src/H5HL.c b/src/H5HL.c index 49aeec0..742307c 100644 --- a/src/H5HL.c +++ b/src/H5HL.c @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -20,17 +20,17 @@ */ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#include /*library */ -#include /*cache */ -#include /*error handling */ -#include /*file access */ -#include /*Free Lists */ -#include /*self */ -#include /*file memory management */ -#include /*core memory management */ -#include /*property lists */ - -#include /*for H5FD_mpio_tas_allsame() */ +#include "H5private.h" /*library */ +#include "H5ACprivate.h" /*cache */ +#include "H5Eprivate.h" /*error handling */ +#include "H5Fpkg.h" /*file access */ +#include "H5FLprivate.h" /*Free Lists */ +#include "H5HLprivate.h" /*self */ +#include "H5MFprivate.h" /*file memory management */ +#include "H5MMprivate.h" /*core memory management */ +#include "H5Pprivate.h" /*property lists */ + +#include "H5FDmpio.h" /*for H5FD_mpio_tas_allsame() */ #define H5HL_FREE_NULL 1 /*end of free list on disk */ #define PABLO_MASK H5HL_mask diff --git a/src/H5HLprivate.h b/src/H5HLprivate.h index 915b248..3385aed 100644 --- a/src/H5HLprivate.h +++ b/src/H5HLprivate.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -17,11 +17,11 @@ #ifndef _H5HLprivate_H #define _H5HLprivate_H -#include +#include "H5HLpublic.h" /* Private headers needed by this file. */ -#include -#include +#include "H5private.h" +#include "H5Fprivate.h" /* * Feature: Define H5HL_DEBUG on the compiler command line if you want to diff --git a/src/H5HLpublic.h b/src/H5HLpublic.h index 30b5a15..cd2cfe9 100644 --- a/src/H5HLpublic.h +++ b/src/H5HLpublic.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -18,7 +18,7 @@ #define _H5HLpublic_H /* Public headers needed by this file */ -#include +#include "H5public.h" #ifdef __cplusplus extern "C" { diff --git a/src/H5I.c b/src/H5I.c index 79a21b0..93c9390 100644 --- a/src/H5I.c +++ b/src/H5I.c @@ -31,11 +31,11 @@ * 1/7/96 - Finished coding prototype * 6/10/97 - Moved into HDF5 library */ -#include -#include -#include -#include /*Free Lists */ -#include +#include "H5private.h" +#include "H5Iprivate.h" +#include "H5Eprivate.h" +#include "H5FLprivate.h" /*Free Lists */ +#include "H5MMprivate.h" /* Interface initialialization? */ #define PABLO_MASK H5I_mask diff --git a/src/H5Iprivate.h b/src/H5Iprivate.h index d18108b..e0e7176 100644 --- a/src/H5Iprivate.h +++ b/src/H5Iprivate.h @@ -19,10 +19,10 @@ #ifndef _H5Iprivate_H #define _H5Iprivate_H -#include /*include Public Definitions */ +#include "H5Ipublic.h" /*include Public Definitions */ /* Private headers needed by this file */ -#include +#include "H5private.h" /* Default sizes of the hash-tables for various atom groups */ #define H5I_ERRSTACK_HASHSIZE 64 diff --git a/src/H5Ipublic.h b/src/H5Ipublic.h index 0157521..118ce98 100644 --- a/src/H5Ipublic.h +++ b/src/H5Ipublic.h @@ -18,7 +18,7 @@ #define _H5Ipublic_H /* Public headers needed by this file */ -#include +#include "H5public.h" /* * Group values allowed. Start with `1' instead of `0' because it makes the diff --git a/src/H5MF.c b/src/H5MF.c index b68e46c..9720635 100644 --- a/src/H5MF.c +++ b/src/H5MF.c @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -22,11 +22,11 @@ */ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#include -#include -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5Fpkg.h" +#include "H5FDprivate.h" +#include "H5MFprivate.h" #define PABLO_MASK H5MF_mask diff --git a/src/H5MFprivate.h b/src/H5MFprivate.h index 99732ad..ee4d884 100644 --- a/src/H5MFprivate.h +++ b/src/H5MFprivate.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -18,9 +18,9 @@ #define _H5MFprivate_H /* Private headers needed by this file */ -#include -#include -#include /*file driver */ +#include "H5private.h" +#include "H5Fprivate.h" +#include "H5FDprivate.h" /*file driver */ /* * Feature: Define H5MF_DEBUG on the compiler command line if you want to diff --git a/src/H5MM.c b/src/H5MM.c index 5d6c2c3..fb962f2 100644 --- a/src/H5MM.c +++ b/src/H5MM.c @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -14,9 +14,9 @@ * *------------------------------------------------------------------------- */ -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5MMprivate.h" /* Interface initialization? */ #define PABLO_MASK H5MM_mask diff --git a/src/H5MMprivate.h b/src/H5MMprivate.h index be5187c..620efda 100644 --- a/src/H5MMprivate.h +++ b/src/H5MMprivate.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -17,10 +17,10 @@ #ifndef _H5MMprivate_H #define _H5MMprivate_h -#include +#include "H5MMpublic.h" /* Private headers needed by this file */ -#include +#include "H5private.h" #define H5MM_malloc(Z) HDmalloc(MAX(1,Z)) #define H5MM_calloc(Z) HDcalloc(1,MAX(1,Z)) diff --git a/src/H5MMpublic.h b/src/H5MMpublic.h index 5b8b579..d7ad2f7 100644 --- a/src/H5MMpublic.h +++ b/src/H5MMpublic.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -19,7 +19,7 @@ #define _H5MMpublic_H /* Public headers needed by this file */ -#include +#include "H5public.h" /* These typedefs are currently used for VL datatype allocation/freeing */ typedef void *(* H5MM_allocate_t)(size_t size,void *info); diff --git a/src/H5O.c b/src/H5O.c index 531bb3d..24808b2 100644 --- a/src/H5O.c +++ b/src/H5O.c @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -16,19 +16,19 @@ */ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#include -#include -#include -#include -#include /*Free Lists */ -#include -#include -#include -#include -#include +#include "H5private.h" +#include "H5ACprivate.h" +#include "H5Eprivate.h" +#include "H5Fpkg.h" +#include "H5FLprivate.h" /*Free Lists */ +#include "H5Iprivate.h" +#include "H5MFprivate.h" +#include "H5MMprivate.h" +#include "H5Oprivate.h" +#include "H5Pprivate.h" /* The MPIO driver for H5FD_mpio_tas_allsame() */ -#include +#include "H5FDmpio.h" #define PABLO_MASK H5O_mask diff --git a/src/H5Oattr.c b/src/H5Oattr.c index 65cb4bf..f0e73d9 100644 --- a/src/H5Oattr.c +++ b/src/H5Oattr.c @@ -15,14 +15,14 @@ #define H5A_PACKAGE /*prevent warning from including H5Tpkg.h */ #define H5S_PACKAGE /*suppress error about including H5Spkg */ -#include -#include -#include /*Free Lists */ -#include -#include -#include -#include -#include /* Data spaces */ +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5FLprivate.h" /*Free Lists */ +#include "H5Gprivate.h" +#include "H5MMprivate.h" +#include "H5Oprivate.h" +#include "H5Apkg.h" +#include "H5Spkg.h" /* Data spaces */ #define PABLO_MASK H5O_attr_mask diff --git a/src/H5Ocomp.c b/src/H5Ocomp.c index 4f1a3e0..5cb6455 100644 --- a/src/H5Ocomp.c +++ b/src/H5Ocomp.c @@ -1,17 +1,17 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Wednesday, April 15, 1998 * * Purpose: Data filter pipeline message. */ -#include -#include -#include /*Free Lists */ -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5FLprivate.h" /*Free Lists */ +#include "H5MMprivate.h" +#include "H5Oprivate.h" /* Interface initialization */ #define PABLO_MASK H5O_pline_mask diff --git a/src/H5Ocont.c b/src/H5Ocont.c index d799475..7cda46b 100644 --- a/src/H5Ocont.c +++ b/src/H5Ocont.c @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -18,10 +18,10 @@ *------------------------------------------------------------------------- */ -#include -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5MMprivate.h" +#include "H5Oprivate.h" #define PABLO_MASK H5O_cont_mask diff --git a/src/H5Odtype.c b/src/H5Odtype.c index 398e5cb..58b68a2 100644 --- a/src/H5Odtype.c +++ b/src/H5Odtype.c @@ -14,13 +14,13 @@ #define H5T_PACKAGE /*prevent warning from including H5Tpkg.h */ -#include -#include -#include /*Free Lists */ -#include -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5FLprivate.h" /*Free Lists */ +#include "H5Gprivate.h" +#include "H5MMprivate.h" +#include "H5Oprivate.h" +#include "H5Tpkg.h" #define PABLO_MASK H5O_dtype_mask diff --git a/src/H5Oefl.c b/src/H5Oefl.c index 6793873..c5ac308 100644 --- a/src/H5Oefl.c +++ b/src/H5Oefl.c @@ -1,18 +1,18 @@ /* - * Copyright (C) 1997 NCSA - * All rights reserved. + * Copyright (C) 1997-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Tuesday, November 25, 1997 */ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#include -#include -#include -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5Fpkg.h" +#include "H5HLprivate.h" +#include "H5MMprivate.h" +#include "H5Oprivate.h" #define PABLO_MASK H5O_efl_mask diff --git a/src/H5Ofill.c b/src/H5Ofill.c index 251801c..e8ccd79 100644 --- a/src/H5Ofill.c +++ b/src/H5Ofill.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Wednesday, September 30, 1998 @@ -8,12 +8,12 @@ * Purpose: The fill message indicates a bit pattern to use for * uninitialized data points of a dataset. */ -#include -#include -#include -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5Iprivate.h" +#include "H5MMprivate.h" +#include "H5Oprivate.h" +#include "H5Pprivate.h" #define PABLO_MASK H5O_fill_mask diff --git a/src/H5Olayout.c b/src/H5Olayout.c index 83d7a6b..6f918f7 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -1,18 +1,18 @@ /* - * Copyright (C) 1997 NCSA - * All rights reserved. + * Copyright (C) 1997-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Wednesday, October 8, 1997 * * Purpose: Messages related to data layout. */ -#include -#include -#include -#include /*Free Lists */ -#include -#include +#include "H5private.h" +#include "H5Dprivate.h" +#include "H5Eprivate.h" +#include "H5FLprivate.h" /*Free Lists */ +#include "H5MMprivate.h" +#include "H5Oprivate.h" /* PRIVATE PROTOTYPES */ static void *H5O_layout_decode(H5F_t *f, const uint8_t *p, H5O_shared_t *sh); diff --git a/src/H5Omtime.c b/src/H5Omtime.c index cbe9b82..6cc92c9 100644 --- a/src/H5Omtime.c +++ b/src/H5Omtime.c @@ -1,17 +1,17 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Friday, July 24, 1998 * * Purpose: The object modification time message. */ -#include -#include -#include /*Free Lists */ -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5FLprivate.h" /*Free Lists */ +#include "H5MMprivate.h" +#include "H5Oprivate.h" #if defined WIN32 #include diff --git a/src/H5Oname.c b/src/H5Oname.c index 97f4bbc..c75cdd7 100644 --- a/src/H5Oname.c +++ b/src/H5Oname.c @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -14,10 +14,10 @@ * *------------------------------------------------------------------------- */ -#include -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5MMprivate.h" +#include "H5Oprivate.h" #define PABLO_MASK H5O_name_mask diff --git a/src/H5Onull.c b/src/H5Onull.c index e9611f7..c94f459 100644 --- a/src/H5Onull.c +++ b/src/H5Onull.c @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -14,8 +14,8 @@ * *------------------------------------------------------------------------- */ -#include -#include +#include "H5private.h" +#include "H5Oprivate.h" #define PABLO_MASK H5O_null_mask diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h index c0cc93c..19ba259 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -17,16 +17,16 @@ #ifndef _H5Oprivate_H #define _H5Oprivate_H -#include +#include "H5Opublic.h" /* Private headers needed by this file */ -#include -#include -#include -#include -#include -#include -#include +#include "H5private.h" +#include "H5Fprivate.h" +#include "H5Gprivate.h" +#include "H5HGprivate.h" +#include "H5Tprivate.h" +#include "H5Spublic.h" +#include "H5Zprivate.h" /* * Align messages on 8-byte boundaries because we would like to copy the diff --git a/src/H5Opublic.h b/src/H5Opublic.h index 4cb501e..7a7c56e 100644 --- a/src/H5Opublic.h +++ b/src/H5Opublic.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -19,7 +19,7 @@ #define _H5Opublic_H /* Public headers needed by this file */ -#include +#include "H5public.h" #ifdef __cplusplus extern "C" { diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c index 8dab984..8cb81f2 100644 --- a/src/H5Osdspace.c +++ b/src/H5Osdspace.c @@ -14,13 +14,13 @@ #define H5S_PACKAGE /*prevent warning from including H5Spkg.h */ -#include -#include -#include /*Free Lists */ -#include -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5FLprivate.h" /*Free Lists */ +#include "H5Gprivate.h" +#include "H5MMprivate.h" +#include "H5Oprivate.h" +#include "H5Spkg.h" #define PABLO_MASK H5O_sdspace_mask diff --git a/src/H5Oshared.c b/src/H5Oshared.c index b33243b..04be059 100644 --- a/src/H5Oshared.c +++ b/src/H5Oshared.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Wednesday, April 1, 1998 @@ -14,10 +14,10 @@ * the global heap. */ -#include -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5MMprivate.h" +#include "H5Oprivate.h" static void *H5O_shared_decode (H5F_t*, const uint8_t*, H5O_shared_t *sh); static herr_t H5O_shared_encode (H5F_t*, uint8_t*, const void*); diff --git a/src/H5Ostab.c b/src/H5Ostab.c index 87188fb..59034a6 100644 --- a/src/H5Ostab.c +++ b/src/H5Ostab.c @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 1997 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 1997-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -14,12 +14,12 @@ * *------------------------------------------------------------------------- */ -#include -#include -#include /*Free Lists */ -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5FLprivate.h" /*Free Lists */ +#include "H5Gprivate.h" +#include "H5MMprivate.h" +#include "H5Oprivate.h" #define PABLO_MASK H5O_stab_mask diff --git a/src/H5P.c b/src/H5P.c index aa23d1e..90db98d 100644 --- a/src/H5P.c +++ b/src/H5P.c @@ -1,44 +1,44 @@ /**************************************************************************** -* NCSA HDF * -* Software Development Group * -* National Center for Supercomputing Applications * -* University of Illinois at Urbana-Champaign * -* 605 E. Springfield, Champaign IL 61820 * -* * -* For conditions of distribution and use, see the accompanying * -* hdf/COPYING file. * -* * +* NCSA HDF * +* Software Development Group * +* National Center for Supercomputing Applications * +* University of Illinois at Urbana-Champaign * +* 605 E. Springfield, Champaign IL 61820 * +* * +* For conditions of distribution and use, see the accompanying * +* hdf/COPYING file. * +* * ****************************************************************************/ /* $Id$ */ /* Private header files */ -#include /* Generic Functions */ -#include /* IDs */ -#include /* B-tree subclass names */ -#include /* Datasets */ -#include /* Error handling */ -#include /* Files */ -#include /* File drivers */ -#include /* Free Lists */ -#include /* Memory management */ -#include /* Property lists */ +#include "H5private.h" /* Generic Functions */ +#include "H5Iprivate.h" /* IDs */ +#include "H5Bprivate.h" /* B-tree subclass names */ +#include "H5Dprivate.h" /* Datasets */ +#include "H5Eprivate.h" /* Error handling */ +#include "H5Fprivate.h" /* Files */ +#include "H5FDprivate.h" /* File drivers */ +#include "H5FLprivate.h" /* Free Lists */ +#include "H5MMprivate.h" /* Memory management */ +#include "H5Pprivate.h" /* Property lists */ /* Default file driver - see H5Pget_driver() */ -#include /* Posix unbuffered I/O file driver */ +#include "H5FDsec2.h" /* Posix unbuffered I/O file driver */ #ifdef WANT_H5_V1_2_COMPAT /* Other predefined file drivers */ -#include /* Files stored entirely in memory */ -#include /* File families */ -#include /* Parallel files using MPI-2 I/O */ -#include /* Standard C buffered I/O */ -#include /* Remote access using SRB */ -#include /* Remote files using GASS I/O */ -#include /* Remote access using Storage Client API */ -#include /* in-memory files streamed via sockets */ -#include /* Usage-partitioned file family */ -#include /* sec2 driver with I/O logging (for debugging) */ +#include "H5FDcore.h" /* Files stored entirely in memory */ +#include "H5FDfamily.h" /* File families */ +#include "H5FDmpio.h" /* Parallel files using MPI-2 I/O */ +#include "H5FDstdio.h" /* Standard C buffered I/O */ +#include "H5FDsrb.h" /* Remote access using SRB */ +#include "H5FDgass.h" /* Remote files using GASS I/O */ +#include "H5FDdpss.h" /* Remote access using Storage Client API */ +#include "H5FDstream.h" /* in-memory files streamed via sockets */ +#include "H5FDmulti.h" /* Usage-partitioned file family */ +#include "H5FDlog.h" /* sec2 driver with I/O logging (for debugging) */ #endif /* WANT_H5_V1_2_COMPAT */ diff --git a/src/H5Pprivate.h b/src/H5Pprivate.h index 15e280e..906826e 100644 --- a/src/H5Pprivate.h +++ b/src/H5Pprivate.h @@ -16,12 +16,12 @@ #ifndef _H5Pprivate_H #define _H5Pprivate_H -#include +#include "H5Ppublic.h" /* Private headers needed by this file */ -#include -#include -#include +#include "H5private.h" +#include "H5Fprivate.h" +#include "H5Dprivate.h" /* Define enum for modifications to class */ typedef enum { diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index 9b5b3c0..0b855bb 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -21,12 +21,12 @@ #define H5P_DEFAULT 0 /* Public headers needed by this file */ -#include -#include -#include -#include -#include -#include +#include "H5public.h" +#include "H5Ipublic.h" +#include "H5Dpublic.h" +#include "H5Fpublic.h" +#include "H5MMpublic.h" +#include "H5Zpublic.h" /* Property list classes */ typedef enum H5P_class_t { diff --git a/src/H5R.c b/src/H5R.c index 495eb32..5868797 100644 --- a/src/H5R.c +++ b/src/H5R.c @@ -14,17 +14,17 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#include /* Generic Functions */ -#include /* ID Functions */ -#include /* Datasets */ -#include /* Error handling */ -#include /* Files */ -#include /* Groups */ -#include /* Global Heaps */ -#include /* Memory Management */ -#include /* References */ -#include /* Dataspaces */ -#include /* Datatypes */ +#include "H5private.h" /* Generic Functions */ +#include "H5Iprivate.h" /* ID Functions */ +#include "H5Dprivate.h" /* Datasets */ +#include "H5Eprivate.h" /* Error handling */ +#include "H5Fpkg.h" /* Files */ +#include "H5Gprivate.h" /* Groups */ +#include "H5HGprivate.h" /* Global Heaps */ +#include "H5MMprivate.h" /* Memory Management */ +#include "H5Rprivate.h" /* References */ +#include "H5Sprivate.h" /* Dataspaces */ +#include "H5Tprivate.h" /* Datatypes */ /* Interface initialization */ #define PABLO_MASK H5R_mask diff --git a/src/H5Rprivate.h b/src/H5Rprivate.h index 91824b9..0ef2bdc 100644 --- a/src/H5Rprivate.h +++ b/src/H5Rprivate.h @@ -16,10 +16,10 @@ #ifndef _H5Rprivate_H #define _H5Rprivate_H -#include +#include "H5Rpublic.h" /* Private headers needed by this file */ -#include +#include "H5private.h" #define H5R_RESERVED_ATOMS 0 diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h index fd97859..443f6e4 100644 --- a/src/H5Rpublic.h +++ b/src/H5Rpublic.h @@ -17,8 +17,8 @@ #define _H5Rpublic_H /* Public headers needed by this file */ -#include -#include +#include "H5public.h" +#include "H5Ipublic.h" /* * Reference types allowed. diff --git a/src/H5S.c b/src/H5S.c index e0213a4..0caf845 100644 --- a/src/H5S.c +++ b/src/H5S.c @@ -15,13 +15,13 @@ #define H5S_PACKAGE /*suppress error about including H5Spkg */ #define _H5S_IN_H5S_C -#include /* Generic Functions */ -#include /* ID Functions */ -#include /* Error handling */ -#include /* Free Lists */ -#include /* Memory Management functions */ -#include /* object headers */ -#include /* Data-space functions */ +#include "H5private.h" /* Generic Functions */ +#include "H5Iprivate.h" /* ID Functions */ +#include "H5Eprivate.h" /* Error handling */ +#include "H5FLprivate.h" /* Free Lists */ +#include "H5MMprivate.h" /* Memory Management functions */ +#include "H5Oprivate.h" /* object headers */ +#include "H5Spkg.h" /* Data-space functions */ /* Interface initialization */ #define PABLO_MASK H5S_mask diff --git a/src/H5Sall.c b/src/H5Sall.c index 8e15b7d..36e4e46 100644 --- a/src/H5Sall.c +++ b/src/H5Sall.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: Quincey Koziol * Tuesday, June 16, 1998 @@ -10,12 +10,12 @@ #define H5S_PACKAGE /*suppress error about including H5Spkg */ -#include -#include -#include -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5Iprivate.h" +#include "H5Spkg.h" +#include "H5Vprivate.h" +#include "H5Dprivate.h" /* Interface initialization */ #define PABLO_MASK H5Sall_mask diff --git a/src/H5Shyper.c b/src/H5Shyper.c index b34c79d..4eb1de6 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: Quincey Koziol * Thursday, June 18, 1998 @@ -10,16 +10,16 @@ #define H5S_PACKAGE /*suppress error about including H5Spkg */ -#include -#include -#include -#include -#include /*Free Lists */ -#include -#include -#include -#include -#include +#include "H5private.h" +#include "H5Dprivate.h" +#include "H5Eprivate.h" +#include "H5Fprivate.h" +#include "H5FLprivate.h" /*Free Lists */ +#include "H5Iprivate.h" +#include "H5MMprivate.h" +#include "H5Pprivate.h" +#include "H5Spkg.h" +#include "H5Vprivate.h" /* Interface initialization */ #define PABLO_MASK H5Shyper_mask diff --git a/src/H5Smpio.c b/src/H5Smpio.c index fb92862..f459719 100644 --- a/src/H5Smpio.c +++ b/src/H5Smpio.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: rky 980813 * @@ -13,12 +13,12 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ #define H5S_PACKAGE /*suppress error about including H5Spkg */ -#include -#include -#include /* Ugly, but necessary for the MPIO I/O accesses */ -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5Fpkg.h" /* Ugly, but necessary for the MPIO I/O accesses */ +#include "H5Spkg.h" -#include /*the MPIO file driver */ +#include "H5FDmpio.h" /*the MPIO file driver */ #ifndef H5_HAVE_PARALLEL /* diff --git a/src/H5Snone.c b/src/H5Snone.c index 8ba47e4..7186d07 100644 --- a/src/H5Snone.c +++ b/src/H5Snone.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: Quincey Koziol * Tuesday, November 10, 1998 @@ -10,12 +10,12 @@ #define H5S_PACKAGE /*suppress error about including H5Spkg */ -#include -#include -#include -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5Iprivate.h" +#include "H5Spkg.h" +#include "H5Vprivate.h" +#include "H5Dprivate.h" /* Interface initialization */ #define PABLO_MASK H5Snone_mask diff --git a/src/H5Spkg.h b/src/H5Spkg.h index 784563d..25a89d1 100644 --- a/src/H5Spkg.h +++ b/src/H5Spkg.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2000 NCSA - * All rights reserved. + * Copyright (C) 2000-2001 NCSA + * All rights reserved. * * Programmer: Quincey Koziol * Thursday, September 28, 2000 @@ -16,7 +16,7 @@ #ifndef _H5Spkg_H #define _H5Spkg_H -#include +#include "H5Sprivate.h" /* * Dataspace extent information diff --git a/src/H5Spoint.c b/src/H5Spoint.c index 0626a42..89ad281 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: Quincey Koziol * Tuesday, June 16, 1998 @@ -10,13 +10,13 @@ #define H5S_PACKAGE /*suppress error about including H5Spkg */ -#include -#include -#include -#include -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5Iprivate.h" +#include "H5MMprivate.h" +#include "H5Spkg.h" +#include "H5Vprivate.h" +#include "H5Dprivate.h" /* Interface initialization */ #define PABLO_MASK H5Spoint_mask diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h index 8dfa6e3..f315b77 100644 --- a/src/H5Sprivate.h +++ b/src/H5Sprivate.h @@ -16,13 +16,13 @@ #ifndef _H5Sprivate_H #define _H5Sprivate_H -#include +#include "H5Spublic.h" /* Private headers needed by this file */ -#include -#include -#include -#include +#include "H5private.h" +#include "H5Dpublic.h" +#include "H5Fprivate.h" +#include "H5Oprivate.h" #define H5S_RESERVED_ATOMS 2 diff --git a/src/H5Spublic.h b/src/H5Spublic.h index 2f2b740..577998b 100644 --- a/src/H5Spublic.h +++ b/src/H5Spublic.h @@ -17,8 +17,8 @@ #define _H5Spublic_H /* Public headers needed by this file */ -#include -#include +#include "H5public.h" +#include "H5Ipublic.h" /* Define atomic datatypes */ #define H5S_ALL 0 diff --git a/src/H5Sselect.c b/src/H5Sselect.c index b99bb53..c97d237 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: Quincey Koziol * Friday, May 29, 1998 @@ -10,13 +10,13 @@ #define H5S_PACKAGE /*suppress error about including H5Spkg */ -#include -#include -#include /*Free Lists */ -#include -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5FLprivate.h" /*Free Lists */ +#include "H5Iprivate.h" +#include "H5MMprivate.h" +#include "H5Spkg.h" +#include "H5Vprivate.h" /* Interface initialization */ #define PABLO_MASK H5Sselect_mask diff --git a/src/H5T.c b/src/H5T.c index 201141c..7501990 100644 --- a/src/H5T.c +++ b/src/H5T.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Tuesday, March 31, 1998 @@ -8,17 +8,17 @@ #define H5T_PACKAGE /*suppress error about including H5Tpkg */ -#include /*generic functions */ -#include /*datasets (for H5Tcopy) */ -#include /*ID functions */ -#include /*error handling */ -#include /*Free Lists */ -#include /*groups */ -#include /*global heap */ -#include /*memory management */ -#include /* Property Lists */ -#include /*data space */ -#include /*data-type functions */ +#include "H5private.h" /*generic functions */ +#include "H5Dprivate.h" /*datasets (for H5Tcopy) */ +#include "H5Iprivate.h" /*ID functions */ +#include "H5Eprivate.h" /*error handling */ +#include "H5FLprivate.h" /*Free Lists */ +#include "H5Gprivate.h" /*groups */ +#include "H5HGprivate.h" /*global heap */ +#include "H5MMprivate.h" /*memory management */ +#include "H5Pprivate.h" /* Property Lists */ +#include "H5Sprivate.h" /*data space */ +#include "H5Tpkg.h" /*data-type functions */ #define PABLO_MASK H5T_mask diff --git a/src/H5TB.c b/src/H5TB.c index fb0eede..ad9bd12 100644 --- a/src/H5TB.c +++ b/src/H5TB.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2000 NCSA - * All rights reserved. + * Copyright (C) 2000-2001 NCSA + * All rights reserved. * * Programmer: Quincey Koziol * Saturday, April 22, 2000 @@ -58,11 +58,11 @@ /* $Id$ */ -#include /*library */ -#include /*error handling */ -#include /*Core memory management */ -#include /*Free Lists */ -#include /*Threaded, balanced, binary trees */ +#include "H5private.h" /*library */ +#include "H5Eprivate.h" /*error handling */ +#include "H5MMprivate.h" /*Core memory management */ +#include "H5FLprivate.h" /*Free Lists */ +#include "H5TBprivate.h" /*Threaded, balanced, binary trees */ # define KEYcmp(k1,k2,a) ((NULL!=compar) ? (*compar)( k1, k2, a) \ : HDmemcmp( k1, k2, 0<(a) ? (a) : HDstrlen(k1) ) ) diff --git a/src/H5TBprivate.h b/src/H5TBprivate.h index 9b13bff..23a75b7 100644 --- a/src/H5TBprivate.h +++ b/src/H5TBprivate.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 2000 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 2000-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -19,7 +19,7 @@ /* Public headers needed by this file */ #ifdef LATER -#include /*Public API prototypes */ +#include "H5TBpublic.h" /*Public API prototypes */ #endif /* LATER */ /* Typedef for key comparison function */ diff --git a/src/H5TS.c b/src/H5TS.c index 7b6af3b..ce3d5ef 100644 --- a/src/H5TS.c +++ b/src/H5TS.c @@ -13,9 +13,9 @@ /* $Id$ */ /* private headers */ -#include /*library */ -#include /*error handling */ -#include /*memory management functions */ +#include "H5private.h" /*library */ +#include "H5Eprivate.h" /*error handling */ +#include "H5MMprivate.h" /*memory management functions */ #ifdef H5_HAVE_THREADSAFE diff --git a/src/H5TSprivate.h b/src/H5TSprivate.h index 2d88637..60ec0af 100644 --- a/src/H5TSprivate.h +++ b/src/H5TSprivate.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- - * Copyright (C) 2000 National Center for Supercomputing Applications. - * All rights reserved. + * Copyright (C) 2000-2001 National Center for Supercomputing Applications + * All rights reserved. * *------------------------------------------------------------------------- * @@ -19,7 +19,7 @@ /* Public headers needed by this file */ #ifdef LATER -#include /*Public API prototypes */ +#include "H5TSpublic.h" /*Public API prototypes */ #endif /* LATER */ /* Library level data structures */ diff --git a/src/H5Tbit.c b/src/H5Tbit.c index 284270e..516b1d1 100644 --- a/src/H5Tbit.c +++ b/src/H5Tbit.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Wednesday, June 10, 1998 @@ -10,10 +10,11 @@ * the bytes are in little-endian order. */ #define H5T_PACKAGE -#include -#include -#include -#include + +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5Iprivate.h" +#include "H5Tpkg.h" /* Interface initialization */ #define PABLO_MASK H5Tbit_mask diff --git a/src/H5Tconv.c b/src/H5Tconv.c index ae4d9b8..a151db2 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1998 Spizella Software - * All rights reserved. + * Copyright (C) 1998-2001 Spizella Software + * All rights reserved. * * Programmer: Robb Matzke * Tuesday, January 13, 1998 @@ -10,12 +10,12 @@ #define H5T_PACKAGE /*suppress error about including H5Tpkg */ #define PABLO_MASK H5Tconv_mask -#include -#include -#include /*Free Lists */ -#include -#include -#include +#include "H5Iprivate.h" +#include "H5Eprivate.h" +#include "H5FLprivate.h" /*Free Lists */ +#include "H5MMprivate.h" +#include "H5Pprivate.h" +#include "H5Tpkg.h" /* Conversion data for H5T_conv_struct() */ typedef struct H5T_conv_struct_t { diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h index 6158d70..64ebc0f 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 1997 NCSA - * All rights reserved. + * Copyright (C) 1997-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Monday, December 8, 1997 @@ -23,11 +23,11 @@ # undef H5T_DEBUG #endif -#include -#include -#include -#include -#include +#include "H5HGprivate.h" +#include "H5Dprivate.h" +#include "H5Fprivate.h" +#include "H5Rprivate.h" +#include "H5Tprivate.h" typedef struct H5T_atomic_t { H5T_order_t order; /*byte order */ diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h index 98511aa..079ea1e 100644 --- a/src/H5Tprivate.h +++ b/src/H5Tprivate.h @@ -16,12 +16,12 @@ #ifndef _H5Tprivate_H #define _H5Tprivate_H -#include +#include "H5Tpublic.h" /* Private headers needed by this file */ -#include -#include /*for H5G_entry_t */ -#include /*for H5R_type_t */ +#include "H5private.h" +#include "H5Gprivate.h" /*for H5G_entry_t */ +#include "H5Rprivate.h" /*for H5R_type_t */ #define H5T_RESERVED_ATOMS 8 #define H5T_NAMELEN 32 /*length of debugging name buffer */ diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h index 160f642..716cf0d 100644 --- a/src/H5Tpublic.h +++ b/src/H5Tpublic.h @@ -17,8 +17,8 @@ #define _H5Tpublic_H /* Public headers needed by this file */ -#include -#include +#include "H5public.h" +#include "H5Ipublic.h" #define HOFFSET(S,M) (offsetof(S,M)) diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c index 133253e..e1515ab 100644 --- a/src/H5Tvlen.c +++ b/src/H5Tvlen.c @@ -14,12 +14,12 @@ #define H5T_PACKAGE /*suppress error about including H5Tpkg */ -#include /* Generic Functions */ -#include /* Errors */ -#include /* Global Heaps */ -#include /* IDs */ -#include /* Memory Allocation */ -#include /* Datatypes */ +#include "H5private.h" /* Generic Functions */ +#include "H5Eprivate.h" /* Errors */ +#include "H5HGprivate.h" /* Global Heaps */ +#include "H5Iprivate.h" /* IDs */ +#include "H5MMprivate.h" /* Memory Allocation */ +#include "H5Tpkg.h" /* Datatypes */ #define PABLO_MASK H5Tvlen_mask diff --git a/src/H5V.c b/src/H5V.c index c972198..ec985e8 100644 --- a/src/H5V.c +++ b/src/H5V.c @@ -1,15 +1,15 @@ /* - * Copyright (C) 1997 NCSA - * All rights reserved. + * Copyright (C) 1997-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Friday, October 10, 1997 */ -#include -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5Oprivate.h" +#include "H5Vprivate.h" #define H5V_HYPER_NDIMS H5O_LAYOUT_NDIMS #define PABLO_MASK H5V_mask diff --git a/src/H5Vprivate.h b/src/H5Vprivate.h index 7dcd45a..dabfe19 100644 --- a/src/H5Vprivate.h +++ b/src/H5Vprivate.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 1997 NCSA - * All rights reserved. + * Copyright (C) 1997-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Friday, October 10, 1997 @@ -8,7 +8,7 @@ #ifndef H5Vprivate_H #define H5Vprivate_H -#include +#include "H5private.h" /* Vector comparison functions like Fortran66 comparison operators */ #define H5V_vector_eq_s(N,V1,V2) (H5V_vector_cmp_s (N, V1, V2)==0) diff --git a/src/H5Z.c b/src/H5Z.c index 99d8d59..d8c03bc 100644 --- a/src/H5Z.c +++ b/src/H5Z.c @@ -1,17 +1,17 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Thursday, April 16, 1998 * * Purpose: Functions for data filters. */ -#include -#include -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5MMprivate.h" +#include "H5Oprivate.h" +#include "H5Zprivate.h" /* Interface initialization */ #define PABLO_MASK H5Z_mask diff --git a/src/H5Zdeflate.c b/src/H5Zdeflate.c index cc7bd12..66d29a8 100644 --- a/src/H5Zdeflate.c +++ b/src/H5Zdeflate.c @@ -1,14 +1,14 @@ /* - * Copyright © 1999 NCSA - * All rights reserved. + * Copyright © 1999-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Friday, August 27, 1999 */ -#include -#include -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5MMprivate.h" +#include "H5Zprivate.h" #ifdef H5_HAVE_ZLIB_H # include diff --git a/src/H5Zprivate.h b/src/H5Zprivate.h index 690bf9e..4726435 100644 --- a/src/H5Zprivate.h +++ b/src/H5Zprivate.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Thursday, April 16, 1998 @@ -8,8 +8,8 @@ #ifndef _H5Zprivate_H #define _H5Zprivate_H -#include -#include +#include "H5Zpublic.h" +#include "H5Fprivate.h" /* * The filter table maps filter identification numbers to structs that diff --git a/src/H5detect.c b/src/H5detect.c index dc6df38..e3d51be 100644 --- a/src/H5detect.c +++ b/src/H5detect.c @@ -1,8 +1,8 @@ /*keep this here -RPM*/ static const char *FileHeader = "\n\ /*-------------------------------------------------------------------------\n\ - * Copyright (C) 1997 National Center for Supercomputing Applications. \n\ - * All rights reserved. \n\ + * Copyright (C) 1997-2001 National Center for Supercomputing Applications \n\ + * All rights reserved. \n\ * \n\ *-------------------------------------------------------------------------"; /* @@ -30,7 +30,7 @@ static const char *FileHeader = "\n\ *------------------------------------------------------------------------- */ #undef NDEBUG -#include +#include "H5private.h" #define MAXDETECT 64 /* @@ -392,12 +392,12 @@ print_results(int nd, detected_t *d) #define H5T_PACKAGE /*suppress error about including H5Tpkg.h*/\n\ #define PABLO_MASK H5Tinit_mask\n\ \n\ -#include \n\ -#include \n\ -#include \n\ -#include \n\ -#include \n\ -#include \n\ +#include \"H5private.h\"\n\ +#include \"H5Iprivate.h\"\n\ +#include \"H5Eprivate.h\"\n\ +#include \"H5FLprivate.h\"\n\ +#include \"H5MMprivate.h\"\n\ +#include \"H5Tpkg.h\"\n\ \n\ static intn interface_initialize_g = 0;\n\ #define INTERFACE_INIT NULL\n\ diff --git a/src/H5private.h b/src/H5private.h index dadb87e..856ce01 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998-2001 NCSA + * All rights reserved. * * Programmer: Robb Matzke * Friday, October 30, 1998 @@ -12,7 +12,9 @@ */ #ifndef _H5private_H #define _H5private_H -#include /* Include Public Definitions */ + +#include "H5public.h" /* Include Public Definitions */ + /* * Since H5config.h is a generated header file, it is messy to try * to put a #ifndef _H5config_H ... #endif guard in it. @@ -21,7 +23,7 @@ * it via H5private.h. The #ifndef _H5private_H guard above would * prevent repeated include. */ -#include /* Include all configuration info */ +#include "H5config.h" /* Include all configuration info */ /* include the pthread library */ #ifdef H5_HAVE_THREADSAFE @@ -160,7 +162,6 @@ # include "ProcIDs.h" #endif - /* * NT doesn't define SIGBUS, but since NT only runs on processors * that do not have alignment constraints a SIGBUS would never be @@ -924,7 +925,7 @@ __DLL__ void H5_trace(hbool_t returning, const char *func, const char *type, #ifdef H5_HAVE_THREADSAFE /* Include required thread-safety header */ -#include +#include "H5TSprivate.h" /* replacement structure for original global variable */ typedef struct H5_api_struct { diff --git a/src/H5public.h b/src/H5public.h index 037ad40..908172a 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -28,7 +28,7 @@ * it via H5public.h. The #ifndef _H5public_H guard above would * prevent repeated include. */ -#include /*from configure */ +#include "H5pubconf.h" /*from configure */ #include #ifdef H5_STDC_HEADERS # include /*for H5T_NATIVE_CHAR defn in H5Tpublic.h */ @@ -55,7 +55,7 @@ #include #endif -#include +#include "H5api_adpt.h" /* Version numbers */ #define H5_VERS_MAJOR 1 /* For major interface/format changes */ diff --git a/src/hdf5.h b/src/hdf5.h index 87e9fdd..70dff3b 100644 --- a/src/hdf5.h +++ b/src/hdf5.h @@ -18,37 +18,37 @@ #ifndef _HDF5_H #define _HDF5_H -#include -#include /* Interface abstraction */ -#include /* Attributes */ -#include /* Metadata cache */ -#include /* B-trees */ -#include /* Datasets */ -#include /* Errors */ -#include /* Files */ -#include /* File drivers */ -#include /* Groups */ -#include /* Global heaps */ -#include /* Local heaps */ -#include /* Memory management */ -#include /* Object headers */ -#include /* Property lists */ -#include /* References */ -#include /* Dataspaces */ -#include /* Datatypes */ -#include /* Data filters */ +#include "H5public.h" +#include "H5Ipublic.h" /* Interface abstraction */ +#include "H5Apublic.h" /* Attributes */ +#include "H5ACpublic.h" /* Metadata cache */ +#include "H5Bpublic.h" /* B-trees */ +#include "H5Dpublic.h" /* Datasets */ +#include "H5Epublic.h" /* Errors */ +#include "H5Fpublic.h" /* Files */ +#include "H5FDpublic.h" /* File drivers */ +#include "H5Gpublic.h" /* Groups */ +#include "H5HGpublic.h" /* Global heaps */ +#include "H5HLpublic.h" /* Local heaps */ +#include "H5MMpublic.h" /* Memory management */ +#include "H5Opublic.h" /* Object headers */ +#include "H5Ppublic.h" /* Property lists */ +#include "H5Rpublic.h" /* References */ +#include "H5Spublic.h" /* Dataspaces */ +#include "H5Tpublic.h" /* Datatypes */ +#include "H5Zpublic.h" /* Data filters */ /* Predefined file drivers */ -#include /* Files stored entirely in memory */ -#include /* File families */ -#include /* Parallel files using MPI-2 I/O */ -#include /* POSIX unbuffered file I/O */ -#include /* Standard C buffered I/O */ -#include /* Remote access using SRB */ -#include /* Remote files using GASS I/O */ -#include /* Remote access using Storage Client API */ -#include /* in-memory files streamed via sockets */ -#include /* Usage-partitioned file family */ -#include /* sec2 driver with I/O logging (for debugging) */ +#include "H5FDcore.h" /* Files stored entirely in memory */ +#include "H5FDfamily.h" /* File families */ +#include "H5FDmpio.h" /* Parallel files using MPI-2 I/O */ +#include "H5FDsec2.h" /* POSIX unbuffered file I/O */ +#include "H5FDstdio.h" /* Standard C buffered I/O */ +#include "H5FDsrb.h" /* Remote access using SRB */ +#include "H5FDgass.h" /* Remote files using GASS I/O */ +#include "H5FDdpss.h" /* Remote access using Storage Client API */ +#include "H5FDstream.h" /* in-memory files streamed via sockets */ +#include "H5FDmulti.h" /* Usage-partitioned file family */ +#include "H5FDlog.h" /* sec2 driver with I/O logging (for debugging) */ #endif -- cgit v0.12