From c514abd4967c7485d8341b036ba4c3848f7fff15 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Tue, 15 May 2001 16:28:04 -0500 Subject: [svn-r3934] Purpose: Code Update Description: Ported change from the 1.5 branch to the 1.4 branch where all HDF5 include files are in quotes instead of angle brackets: #include "hdf5_file.h" instead of #include Platforms tested: Linux --- c++/src/H5Include.h | 2 +- c++/test/Makefile.in | 2 +- config/depend1.in | 3 +- doc/html/TechNotes/openmp-hdf5.c | 8 ++--- doc/html/Tutor/examples/h5_crtatt.c | 2 +- doc/html/Tutor/examples/h5_crtdat.c | 2 +- doc/html/Tutor/examples/h5_crtfile.c | 2 +- doc/html/Tutor/examples/h5_crtgrp.c | 2 +- doc/html/Tutor/examples/h5_crtgrpar.c | 2 +- doc/html/Tutor/examples/h5_crtgrpd.c | 2 +- doc/html/Tutor/examples/h5_iterate.c | 6 ++-- doc/html/Tutor/examples/h5_mount.c | 2 +- doc/html/Tutor/examples/h5_rdwt.c | 2 +- doc/html/Tutor/examples/h5_ref2obj.c | 2 +- doc/html/Tutor/examples/h5_ref2objr.c | 2 +- doc/html/Tutor/examples/h5_ref2objw.c | 2 +- doc/html/Tutor/examples/h5_ref2reg.c | 2 +- doc/html/Tutor/examples/h5_ref2regr.c | 2 +- doc/html/Tutor/examples/h5_ref2regw.c | 2 +- doc/html/Tutor/examples/h5_reference.c | 2 +- doc/html/ph5example.c | 3 +- examples/h5_attribute.c | 2 +- examples/h5_mount.c | 2 +- examples/h5_reference.c | 2 +- examples/h5_select.c | 2 +- examples/h5_write.c | 2 +- examples/ph5example.c | 2 +- fortran/src/H5Git.c | 7 ++-- fortran/src/H5Git.h | 2 +- fortran/src/H5Tf.c | 1 - fortran/src/H5f90.h | 2 +- hl/tools/gif2h5/gif.h | 2 +- hl/tools/gif2h5/gif2hdf.c | 8 ++--- hl/tools/gif2h5/gif2mem.c | 5 ++- src/H5.c | 28 ++++++++-------- src/H5A.c | 24 +++++++------- src/H5AC.c | 12 +++---- src/H5ACprivate.h | 6 ++-- src/H5ACpublic.h | 2 +- src/H5Apkg.h | 6 ++-- src/H5Aprivate.h | 4 +-- src/H5Apublic.h | 2 +- src/H5B.c | 22 ++++++------- src/H5Bprivate.h | 8 ++--- src/H5Bpublic.h | 2 +- src/H5D.c | 30 ++++++++--------- src/H5Dcontig.c | 10 +++--- src/H5Distore.c | 24 +++++++------- src/H5Dprivate.h | 16 ++++----- src/H5Dpublic.h | 4 +-- src/H5Dseq.c | 24 +++++++------- src/H5E.c | 8 ++--- src/H5Eprivate.h | 4 +-- src/H5Epublic.h | 4 +-- src/H5F.c | 48 +++++++++++++-------------- src/H5FDcore.c | 14 ++++---- src/H5FDcore.h | 2 +- src/H5FDdpss.c | 14 ++++---- src/H5FDdpss.h | 5 ++- src/H5FDfamily.c | 15 ++++----- src/H5FDfamily.h | 2 +- src/H5FDgass.c | 15 ++++----- src/H5FDgass.h | 4 +-- src/H5FDlog.c | 17 +++++----- src/H5FDlog.h | 3 +- src/H5FDmpio.c | 14 ++++---- src/H5FDmpio.h | 4 +-- src/H5FDmulti.c | 3 +- src/H5FDmulti.h | 2 +- src/H5FDprivate.h | 2 +- src/H5FDsec2.c | 16 ++++----- src/H5FDsec2.h | 2 +- src/H5FDsrb.c | 15 ++++----- src/H5FDsrb.h | 8 ++--- src/H5FDstdio.c | 3 +- src/H5FDstdio.h | 2 +- src/H5FDstream.c | 14 ++++---- src/H5FDstream.h | 2 +- src/H5FL.c | 8 ++--- src/H5FLprivate.h | 2 +- src/H5Farray.c | 24 +++++++------- src/H5Fcontig.c | 10 +++--- src/H5Fistore.c | 24 +++++++------- src/H5Fpkg.h | 4 +-- src/H5Fprivate.h | 4 +-- src/H5Fpublic.h | 4 +-- src/H5Fseq.c | 24 +++++++------- src/H5G.c | 24 +++++++------- src/H5Gent.c | 12 +++---- src/H5Gnode.c | 28 ++++++++-------- src/H5Gpkg.h | 4 +-- src/H5Gprivate.h | 8 ++--- src/H5Gpublic.h | 5 +-- src/H5Gstab.c | 14 ++++---- src/H5HG.c | 22 ++++++------- src/H5HGprivate.h | 5 ++- src/H5HGpublic.h | 2 +- src/H5HL.c | 22 ++++++------- src/H5HLprivate.h | 6 ++-- src/H5HLpublic.h | 2 +- src/H5I.c | 10 +++--- src/H5Iprivate.h | 4 +-- src/H5Ipublic.h | 2 +- src/H5MF.c | 10 +++--- src/H5MFprivate.h | 6 ++-- src/H5MM.c | 6 ++-- src/H5MMprivate.h | 4 +-- src/H5MMpublic.h | 2 +- src/H5O.c | 22 ++++++------- src/H5Oattr.c | 20 ++++++------ src/H5Ocomp.c | 10 +++--- src/H5Ocont.c | 8 ++--- src/H5Odtype.c | 14 ++++---- src/H5Oefl.c | 12 +++---- src/H5Ofill.c | 12 +++---- src/H5Olayout.c | 12 +++---- src/H5Omtime.c | 10 +++--- src/H5Oname.c | 10 +++--- src/H5Onull.c | 4 +-- src/H5Oprivate.h | 16 ++++----- src/H5Opublic.h | 2 +- src/H5Osdspace.c | 14 ++++---- src/H5Oshared.c | 8 ++--- src/H5Ostab.c | 12 +++---- src/H5P.c | 42 ++++++++++++------------ 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 | 12 +++---- src/H5Shyper.c | 20 ++++++------ src/H5Smpio.c | 10 +++--- src/H5Snone.c | 12 +++---- src/H5Spkg.h | 2 +- src/H5Spoint.c | 14 ++++---- src/H5Sprivate.h | 10 +++--- src/H5Spublic.h | 4 +-- src/H5Sselect.c | 14 ++++---- src/H5T.c | 22 ++++++------- src/H5TB.c | 12 +++---- src/H5TBprivate.h | 2 +- src/H5TS.c | 6 ++-- src/H5TSprivate.h | 2 +- src/H5Tbit.c | 8 ++--- src/H5Tconv.c | 12 +++---- src/H5Tpkg.h | 10 +++--- src/H5Tprivate.h | 8 ++--- src/H5Tpublic.h | 4 +-- src/H5Tvlen.c | 16 ++++----- src/H5V.c | 8 ++--- src/H5Vprivate.h | 2 +- src/H5Z.c | 10 +++--- src/H5Zdeflate.c | 8 ++--- src/H5Zprivate.h | 4 +-- src/H5detect.c | 14 ++++---- src/H5private.h | 15 +++++---- src/H5public.h | 4 +-- src/hdf5.h | 60 +++++++++++++++++----------------- test/big.c | 2 +- test/bittests.c | 4 +-- test/chunk.c | 2 +- test/cmpd_dset.c | 2 +- test/dpss_read.c | 2 +- test/dpss_write.c | 2 +- test/dsets.c | 2 +- test/dtypes.c | 4 +-- test/enum.c | 2 +- test/extend.c | 2 +- test/external.c | 2 +- test/fillval.c | 2 +- test/flush1.c | 2 +- test/flush2.c | 2 +- test/gass_append.c | 2 +- test/gass_read.c | 2 +- test/gass_write.c | 2 +- test/gen_new_array.c | 2 +- test/gen_old_array.c | 2 +- test/gheap.c | 16 ++++----- test/h5test.c | 4 ++- test/h5test.h | 6 ++-- test/hyperslab.c | 6 ++-- test/iopipe.c | 8 ++--- test/istore.c | 20 ++++++------ test/lheap.c | 6 ++-- test/links.c | 2 +- test/mount.c | 2 +- test/mtime.c | 2 +- test/ohdr.c | 8 ++--- test/overhead.c | 4 +-- test/space_overflow.c | 2 +- test/srb_append.c | 2 +- test/srb_read.c | 2 +- test/srb_write.c | 3 +- test/stab.c | 4 +-- test/stream_test.c | 2 +- test/tarray.c | 4 +-- test/tattr.c | 4 +-- test/testhdf5.c | 2 +- test/testhdf5.h | 4 +-- test/tfile.c | 8 ++--- test/tgenprop.c | 22 ++++++------- test/th5s.c | 10 +++--- test/titerate.c | 22 ++++++------- test/tmeta.c | 6 ++-- test/trefer.c | 22 ++++++------- test/tselect.c | 22 ++++++------- test/ttime.c | 22 ++++++------- test/ttsafe.h | 6 ++-- test/tvlstr.c | 22 ++++++------- test/tvltypes.c | 22 ++++++------- test/unlink.c | 2 +- tools/gifconv/gif.h | 2 +- tools/gifconv/gif2hdf.c | 8 ++--- tools/gifconv/gif2mem.c | 5 ++- tools/h5dump/h5dumptst.c | 3 +- tools/h5ls/h5ls.c | 4 +-- tools/misc/h5debug.c | 20 ++++++------ tools/misc/h5import.c | 5 +-- tools/misc/h5repart.c | 15 +++++---- tools/misc/pdb2hdf.c | 2 +- 222 files changed, 939 insertions(+), 944 deletions(-) diff --git a/c++/src/H5Include.h b/c++/src/H5Include.h index b64511a..bcecf11 100644 --- a/c++/src/H5Include.h +++ b/c++/src/H5Include.h @@ -5,4 +5,4 @@ // This problem is removed. I could replace all #include "H5Include.h" // by #include , but decide not to. BMR - 3/22/01 -#include +#include "hdf5.h" diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index f0bc1bd..3be7a91 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -38,7 +38,7 @@ TESTHDF5_OBJ=testhdf5.lo tfile.lo th5s.lo TEST_SCRIPTS= -DISTCLEAN=$(TEST_PROGS_SRC:.cpp=.lo) $(TEST_PROGS_SRC:.cpp=.o) *.h5 +DISTCLEAN=$(TEST_PROGS_SRC:.cpp=.lo) $(TEST_PROGS_SRC:.cpp=.o) $(TEST_PROGS): $(LIB) $(LIBHDF5) diff --git a/config/depend1.in b/config/depend1.in index b46d0e8..ad5b79f 100644 --- a/config/depend1.in +++ b/config/depend1.in @@ -40,7 +40,7 @@ $(srcdir)/Dependencies: .depend obj=`basename $$dep .c`.lo; \ sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \ $(TRACE) $$dep; \ - $(CC) -M -MG $(CPPFLAGS) $$dep 2>/dev/null | \ + $(CC) -MM -MG $(CPPFLAGS) $$dep 2>/dev/null | \ sed 's% $(srcdir)/% $$(srcdir)/%g' | \ sed 's% $(top_srcdir)/% $$(top_srcdir)/%g' | \ sed 's% $(top_builddir)/% $$(top_builddir)/%g' | \ @@ -51,4 +51,3 @@ $(srcdir)/Dependencies: .depend done; -include .depend - diff --git a/doc/html/TechNotes/openmp-hdf5.c b/doc/html/TechNotes/openmp-hdf5.c index 6d61c38..2765589 100644 --- a/doc/html/TechNotes/openmp-hdf5.c +++ b/doc/html/TechNotes/openmp-hdf5.c @@ -11,7 +11,7 @@ Appendix A: OpenMP-HDF5 Programs * it is safe to use HDF. */ -#include +#include "hdf5.h" #include #include @@ -142,7 +142,7 @@ void CalcWriteData(hid_t fid, hid_t dataspace, hid_t datatype) * */ -#include +#include "hdf5.h" #include #define FILE "SDS.h5" @@ -232,7 +232,7 @@ main (void) * the HDF5 file in parallel. This program only works occasionally. */ -#include +#include "hdf5.h" #include #define FILE "SDS.h5" @@ -328,7 +328,7 @@ void writeData(int id, hid_t file, hid_t dataspace, hid_t datatype, char *dname) * parallel. It also only works occasionally. */ -#include +#include "hdf5.h" #include #define FILE "SDS.h5" diff --git a/doc/html/Tutor/examples/h5_crtatt.c b/doc/html/Tutor/examples/h5_crtatt.c index a2b887c..5802538 100644 --- a/doc/html/Tutor/examples/h5_crtatt.c +++ b/doc/html/Tutor/examples/h5_crtatt.c @@ -2,7 +2,7 @@ * Creating a dataset attribute. */ -#include +#include "hdf5.h" #define FILE "dset.h5" main() { diff --git a/doc/html/Tutor/examples/h5_crtdat.c b/doc/html/Tutor/examples/h5_crtdat.c index d704cf1..cb165b8 100644 --- a/doc/html/Tutor/examples/h5_crtdat.c +++ b/doc/html/Tutor/examples/h5_crtdat.c @@ -2,7 +2,7 @@ * Creating and closing a dataset. */ -#include +#include "hdf5.h" #define FILE "dset.h5" main() { diff --git a/doc/html/Tutor/examples/h5_crtfile.c b/doc/html/Tutor/examples/h5_crtfile.c index 680cde8..1857abd 100644 --- a/doc/html/Tutor/examples/h5_crtfile.c +++ b/doc/html/Tutor/examples/h5_crtfile.c @@ -2,7 +2,7 @@ * Creating and closing a file. */ -#include +#include "hdf5.h" #define FILE "file.h5" main() { diff --git a/doc/html/Tutor/examples/h5_crtgrp.c b/doc/html/Tutor/examples/h5_crtgrp.c index a6aad93..3f003f1 100644 --- a/doc/html/Tutor/examples/h5_crtgrp.c +++ b/doc/html/Tutor/examples/h5_crtgrp.c @@ -2,7 +2,7 @@ * Creating and closing a group. */ -#include +#include "hdf5.h" #define FILE "group.h5" main() { diff --git a/doc/html/Tutor/examples/h5_crtgrpar.c b/doc/html/Tutor/examples/h5_crtgrpar.c index 6dcc003..0569013 100644 --- a/doc/html/Tutor/examples/h5_crtgrpar.c +++ b/doc/html/Tutor/examples/h5_crtgrpar.c @@ -2,7 +2,7 @@ * Creating groups using absolute and relative names. */ -#include +#include "hdf5.h" #define FILE "groups.h5" main() { diff --git a/doc/html/Tutor/examples/h5_crtgrpd.c b/doc/html/Tutor/examples/h5_crtgrpd.c index e497764..c803fed 100644 --- a/doc/html/Tutor/examples/h5_crtgrpd.c +++ b/doc/html/Tutor/examples/h5_crtgrpd.c @@ -2,7 +2,7 @@ * Create two datasets within groups. */ -#include +#include "hdf5.h" #define FILE "groups.h5" main() { diff --git a/doc/html/Tutor/examples/h5_iterate.c b/doc/html/Tutor/examples/h5_iterate.c index db58183..20c13f5 100644 --- a/doc/html/Tutor/examples/h5_iterate.c +++ b/doc/html/Tutor/examples/h5_iterate.c @@ -1,7 +1,7 @@ -#include +#include "hdf5.h" -#define FILE "iterate.h5" -#define FALSE 0 +#define FILE "iterate.h5" +#define FALSE 0 /* 1-D dataset with fixed dimensions */ #define SPACE1_NAME "Space1" diff --git a/doc/html/Tutor/examples/h5_mount.c b/doc/html/Tutor/examples/h5_mount.c index 452ad6e..352d02e 100644 --- a/doc/html/Tutor/examples/h5_mount.c +++ b/doc/html/Tutor/examples/h5_mount.c @@ -6,7 +6,7 @@ * under name /G/D and data is printed out. */ -#include +#include "hdf5.h" #define FILE1 "mount1.h5" #define FILE2 "mount2.h5" diff --git a/doc/html/Tutor/examples/h5_rdwt.c b/doc/html/Tutor/examples/h5_rdwt.c index e651a29..58dfa62 100644 --- a/doc/html/Tutor/examples/h5_rdwt.c +++ b/doc/html/Tutor/examples/h5_rdwt.c @@ -2,7 +2,7 @@ * Writing and reading an existing dataset. */ -#include +#include "hdf5.h" #define FILE "dset.h5" main() { diff --git a/doc/html/Tutor/examples/h5_ref2obj.c b/doc/html/Tutor/examples/h5_ref2obj.c index d5699a7..e8974e4 100644 --- a/doc/html/Tutor/examples/h5_ref2obj.c +++ b/doc/html/Tutor/examples/h5_ref2obj.c @@ -1,4 +1,4 @@ -#include +#include "hdf5.h" /* This program shows how to create and store references to the objects. diff --git a/doc/html/Tutor/examples/h5_ref2objr.c b/doc/html/Tutor/examples/h5_ref2objr.c index a226778..1b1d61a 100644 --- a/doc/html/Tutor/examples/h5_ref2objr.c +++ b/doc/html/Tutor/examples/h5_ref2objr.c @@ -1,5 +1,5 @@ #include -#include +#include "hdf5.h" #define FILE1 "trefer1.h5" diff --git a/doc/html/Tutor/examples/h5_ref2objw.c b/doc/html/Tutor/examples/h5_ref2objw.c index d499f8e..c3160b4 100644 --- a/doc/html/Tutor/examples/h5_ref2objw.c +++ b/doc/html/Tutor/examples/h5_ref2objw.c @@ -1,5 +1,5 @@ -#include +#include "hdf5.h" #define FILE1 "trefer1.h5" diff --git a/doc/html/Tutor/examples/h5_ref2reg.c b/doc/html/Tutor/examples/h5_ref2reg.c index 9dcaff5..c5bf7ca 100644 --- a/doc/html/Tutor/examples/h5_ref2reg.c +++ b/doc/html/Tutor/examples/h5_ref2reg.c @@ -12,7 +12,7 @@ and selected elements data from the integer dataset. */ -#include +#include "hdf5.h" #define filename "REF_REG.h5" #define dsetnamev "MATRIX" diff --git a/doc/html/Tutor/examples/h5_ref2regr.c b/doc/html/Tutor/examples/h5_ref2regr.c index 9f747ae..acfff5e 100644 --- a/doc/html/Tutor/examples/h5_ref2regr.c +++ b/doc/html/Tutor/examples/h5_ref2regr.c @@ -1,5 +1,5 @@ #include -#include +#include "hdf5.h" #define FILE2 "trefer2.h5" #define NPOINTS 10 diff --git a/doc/html/Tutor/examples/h5_ref2regw.c b/doc/html/Tutor/examples/h5_ref2regw.c index 5f27950..4b39e72 100644 --- a/doc/html/Tutor/examples/h5_ref2regw.c +++ b/doc/html/Tutor/examples/h5_ref2regw.c @@ -1,5 +1,5 @@ #include -#include +#include "hdf5.h" #define FILE2 "trefer2.h5" #define SPACE1_NAME "Space1" diff --git a/doc/html/Tutor/examples/h5_reference.c b/doc/html/Tutor/examples/h5_reference.c index a69afe2..f5b4745 100644 --- a/doc/html/Tutor/examples/h5_reference.c +++ b/doc/html/Tutor/examples/h5_reference.c @@ -8,7 +8,7 @@ * */ -#include +#include "hdf5.h" #define FILE "refere.h5" diff --git a/doc/html/ph5example.c b/doc/html/ph5example.c index 84f5ab7..48feb89 100644 --- a/doc/html/ph5example.c +++ b/doc/html/ph5example.c @@ -14,7 +14,8 @@ */ #include -#include + +#include "hdf5.h" #ifdef H5_HAVE_PARALLEL /* Temporary source code */ diff --git a/examples/h5_attribute.c b/examples/h5_attribute.c index ee81d10..87ffa03 100644 --- a/examples/h5_attribute.c +++ b/examples/h5_attribute.c @@ -11,7 +11,7 @@ */ #include -#include +#include "hdf5.h" #define FILE "Attributes.h5" diff --git a/examples/h5_mount.c b/examples/h5_mount.c index 452ad6e..352d02e 100644 --- a/examples/h5_mount.c +++ b/examples/h5_mount.c @@ -6,7 +6,7 @@ * under name /G/D and data is printed out. */ -#include +#include "hdf5.h" #define FILE1 "mount1.h5" #define FILE2 "mount2.h5" diff --git a/examples/h5_reference.c b/examples/h5_reference.c index b10495d..e553709 100644 --- a/examples/h5_reference.c +++ b/examples/h5_reference.c @@ -9,7 +9,7 @@ */ #include -#include +#include "hdf5.h" #define FILE "refere.h5" diff --git a/examples/h5_select.c b/examples/h5_select.c index 5626e03..315ad64 100644 --- a/examples/h5_select.c +++ b/examples/h5_select.c @@ -9,7 +9,7 @@ * memory dataset preserving the shape of the selection. */ -#include +#include "hdf5.h" #define FILE "Select.h5" diff --git a/examples/h5_write.c b/examples/h5_write.c index 7611950..df4c692 100644 --- a/examples/h5_write.c +++ b/examples/h5_write.c @@ -3,7 +3,7 @@ * Data conversion is performed during write operation. */ -#include +#include "hdf5.h" #define FILE "SDS.h5" #define DATASETNAME "IntArray" diff --git a/examples/ph5example.c b/examples/ph5example.c index 84f5ab7..1641c1f 100644 --- a/examples/ph5example.c +++ b/examples/ph5example.c @@ -14,7 +14,7 @@ */ #include -#include +#include "hdf5.h" #ifdef H5_HAVE_PARALLEL /* Temporary source code */ diff --git a/fortran/src/H5Git.c b/fortran/src/H5Git.c index 51db86f..c18c3d3 100644 --- a/fortran/src/H5Git.c +++ b/fortran/src/H5Git.c @@ -5,8 +5,9 @@ *------------------------------------------------------------------------- */ -#include +#include "hdf5.h" #include "H5Git.h" + #define FALSE 0 herr_t count_elems(hid_t loc_id, const char *name, void *opdata); @@ -49,7 +50,7 @@ typedef struct retval { * *------------------------------------------------------------------------- */ -int +int H5Gn_members( hid_t loc_id, char *group_name ) { int res; @@ -100,7 +101,7 @@ H5Gn_members( hid_t loc_id, char *group_name ) * *------------------------------------------------------------------------- */ -herr_t +herr_t H5Gget_obj_info_idx( hid_t loc_id, char *group_name, int idx, char **objname, int *type ) { int res; diff --git a/fortran/src/H5Git.h b/fortran/src/H5Git.h index e243a18..7211440 100644 --- a/fortran/src/H5Git.h +++ b/fortran/src/H5Git.h @@ -7,7 +7,7 @@ #ifndef _H5Git_H #define _H5Git_H -#include +#include "hdf5.h" int H5Gn_members( hid_t loc_id, char *group_name ); diff --git a/fortran/src/H5Tf.c b/fortran/src/H5Tf.c index 06ca00b..fcb5f41 100644 --- a/fortran/src/H5Tf.c +++ b/fortran/src/H5Tf.c @@ -1,6 +1,5 @@ #include "H5f90.h" - /*---------------------------------------------------------------------------- * Name: h5topen_c * Purpose: Call H5Topen to open a datatype diff --git a/fortran/src/H5f90.h b/fortran/src/H5f90.h index 94f61eb..ab72b91 100644 --- a/fortran/src/H5f90.h +++ b/fortran/src/H5f90.h @@ -1,7 +1,7 @@ #ifndef _H5f90_H #define _H5f90_H -#include +#include "hdf5.h" #include "H5f90i.h" #include "H5f90proto.h" diff --git a/hl/tools/gif2h5/gif.h b/hl/tools/gif2h5/gif.h index f697881..7f1d042 100644 --- a/hl/tools/gif2h5/gif.h +++ b/hl/tools/gif2h5/gif.h @@ -6,7 +6,7 @@ #ifndef GIF_H #define GIF_H 1 -#include +#include "hdf5.h" #include #include diff --git a/hl/tools/gif2h5/gif2hdf.c b/hl/tools/gif2h5/gif2hdf.c index 0211143..76f522e 100644 --- a/hl/tools/gif2h5/gif2hdf.c +++ b/hl/tools/gif2h5/gif2hdf.c @@ -1,14 +1,12 @@ -/* #include */ +/* #include "hdf.h" */ #include "gif.h" #include #include #include + int -main(argv , argc) -int argv; -char *argc[]; +main(int argv , char *argc[]) { - GIFTOMEM GifMemoryStruct; GIFIMAGEDESC gifImageDesc; diff --git a/hl/tools/gif2h5/gif2mem.c b/hl/tools/gif2h5/gif2mem.c index 92ca8e5..127ddd6 100644 --- a/hl/tools/gif2h5/gif2mem.c +++ b/hl/tools/gif2h5/gif2mem.c @@ -22,14 +22,13 @@ \****************************************************************************/ #include #include "gif.h" -/* #include */ +/* #include "hdf.h" */ #define VERSION "1.00" extern int EndianOrder; GIFTOMEM -Gif2Mem(MemGif) -BYTE *MemGif; +Gif2Mem(BYTE *MemGif) { /* ** The gif structure outline for passing data to memory diff --git a/src/H5.c b/src/H5.c index 776d23d..b5f1ef0 100644 --- a/src/H5.c +++ b/src/H5.c @@ -13,22 +13,22 @@ /* $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) diff --git a/src/H5A.c b/src/H5A.c index 1d63594..d0cb6a1 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..eb6f678 100644 --- a/src/H5AC.c +++ b/src/H5AC.c @@ -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..91ea4ee 100644 --- a/src/H5ACprivate.h +++ b/src/H5ACprivate.h @@ -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..3fc620b 100644 --- a/src/H5ACpublic.h +++ b/src/H5ACpublic.h @@ -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..e798572 100644 --- a/src/H5Apkg.h +++ b/src/H5Apkg.h @@ -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 c8f89ec..f1bb4a2 100644 --- a/src/H5B.c +++ b/src/H5B.c @@ -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..7e10658 100644 --- a/src/H5Bprivate.h +++ b/src/H5Bprivate.h @@ -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..1a62e42 100644 --- a/src/H5Bpublic.h +++ b/src/H5Bpublic.h @@ -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..dd1eaed 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 569563f..dfa00b9 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -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..884e17b 100644 --- a/src/H5Distore.c +++ b/src/H5Distore.c @@ -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 b514813..0d85144 100644 --- a/src/H5Dseq.c +++ b/src/H5Dseq.c @@ -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..1cdda01 100644 --- a/src/H5E.c +++ b/src/H5E.c @@ -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..dd4c0be 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/H5FDcore.c b/src/H5FDcore.c index ae70cbe..4a464bd 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -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..f76021f 100644 --- a/src/H5FDcore.h +++ b/src/H5FDcore.h @@ -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..6edc6c4 100644 --- a/src/H5FDdpss.c +++ b/src/H5FDdpss.c @@ -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..969ff38 100644 --- a/src/H5FDdpss.h +++ b/src/H5FDdpss.h @@ -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()) @@ -29,4 +29,3 @@ herr_t H5Pget_fapl_dpss (hid_t fapl_id); #endif #endif /* H5FDdpss_H */ - diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c index cbc0d34..5463543 100644 --- a/src/H5FDfamily.c +++ b/src/H5FDfamily.c @@ -21,14 +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 #define MAX(X,Y) ((X)>(Y)?(X):(Y)) diff --git a/src/H5FDfamily.h b/src/H5FDfamily.h index 98683e2..182ff8a 100644 --- a/src/H5FDfamily.h +++ b/src/H5FDfamily.h @@ -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..b72e263 100644 --- a/src/H5FDgass.c +++ b/src/H5FDgass.c @@ -8,14 +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 #define MAX(X,Y) ((X)>(Y)?(X):(Y)) diff --git a/src/H5FDgass.h b/src/H5FDgass.h index f1ce6f1..5f06e0e 100644 --- a/src/H5FDgass.h +++ b/src/H5FDgass.h @@ -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..22060e8 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -14,15 +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 #undef MAX diff --git a/src/H5FDlog.h b/src/H5FDlog.h index 581569a..1221291 100644 --- a/src/H5FDlog.h +++ b/src/H5FDlog.h @@ -10,7 +10,7 @@ #ifndef H5FDlog_H #define H5FDlog_H -#include +#include "H5Ipublic.h" #define H5FD_LOG (H5FD_log_init()) @@ -25,4 +25,3 @@ __DLL__ herr_t H5Pset_fapl_log(hid_t fapl_id, char *logfile, int verbosity); #endif #endif - diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index ee3ecea..d20471f 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -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..c2522ba 100644 --- a/src/H5FDmpio.h +++ b/src/H5FDmpio.h @@ -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..5deb33d 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -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..c1c44f3 100644 --- a/src/H5FDmulti.h +++ b/src/H5FDmulti.h @@ -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..9a8e2ab 100644 --- a/src/H5FDprivate.h +++ b/src/H5FDprivate.h @@ -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/H5FDsec2.c b/src/H5FDsec2.c index ebf4c64..4c9f967 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -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 778fbd6..533f648 100644 --- a/src/H5FDsec2.h +++ b/src/H5FDsec2.h @@ -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..ac38b65 100644 --- a/src/H5FDsrb.c +++ b/src/H5FDsrb.c @@ -7,14 +7,13 @@ * * 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 */ static hid_t H5FD_SRB_g = 0; diff --git a/src/H5FDsrb.h b/src/H5FDsrb.h index 66358b6..306be7c 100644 --- a/src/H5FDsrb.h +++ b/src/H5FDsrb.h @@ -1,6 +1,6 @@ /* - * Copyright 1999 NCSA - * All rights reserved. + * Copyright (c) 1999 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..48784fd 100644 --- a/src/H5FDstdio.c +++ b/src/H5FDstdio.c @@ -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..65234cc 100644 --- a/src/H5FDstdio.h +++ b/src/H5FDstdio.h @@ -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..b0b093c 100644 --- a/src/H5FL.c +++ b/src/H5FL.c @@ -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..c83f631 100644 --- a/src/H5FLprivate.h +++ b/src/H5FLprivate.h @@ -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 3d9e225..d47265b 100644 --- a/src/H5Farray.c +++ b/src/H5Farray.c @@ -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 569563f..dfa00b9 100644 --- a/src/H5Fcontig.c +++ b/src/H5Fcontig.c @@ -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..884e17b 100644 --- a/src/H5Fistore.c +++ b/src/H5Fistore.c @@ -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 8fbec7b..ae9726f 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -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 b514813..0d85144 100644 --- a/src/H5Fseq.c +++ b/src/H5Fseq.c @@ -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..106281f 100644 --- a/src/H5G.c +++ b/src/H5G.c @@ -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..993eb76 100644 --- a/src/H5Gent.c +++ b/src/H5Gent.c @@ -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..119d8b5 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -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..475124f 100644 --- a/src/H5Gpkg.h +++ b/src/H5Gpkg.h @@ -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..562e2ed 100644 --- a/src/H5Gprivate.h +++ b/src/H5Gprivate.h @@ -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..8543d24 100644 --- a/src/H5Gpublic.h +++ b/src/H5Gpublic.h @@ -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..c8eb919 100644 --- a/src/H5Gstab.c +++ b/src/H5Gstab.c @@ -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..f752f00 100644 --- a/src/H5HG.c +++ b/src/H5HG.c @@ -24,17 +24,17 @@ * for a new object based on object size, amount of free space * in the collection, and temporal locality. */ -#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 */ +#define H5F_PACKAGE /*suppress error about including H5Fpkg */ + +#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..2fed015 100644 --- a/src/H5HGprivate.h +++ b/src/H5HGprivate.h @@ -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..a4bf88c 100644 --- a/src/H5HGpublic.h +++ b/src/H5HGpublic.h @@ -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..bfcf7a5 100644 --- a/src/H5HL.c +++ b/src/H5HL.c @@ -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..c309fc1 100644 --- a/src/H5HLprivate.h +++ b/src/H5HLprivate.h @@ -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..cefa826 100644 --- a/src/H5HLpublic.h +++ b/src/H5HLpublic.h @@ -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..133fb5f 100644 --- a/src/H5MF.c +++ b/src/H5MF.c @@ -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..cf5b7e0 100644 --- a/src/H5MFprivate.h +++ b/src/H5MFprivate.h @@ -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..fc57d15 100644 --- a/src/H5MM.c +++ b/src/H5MM.c @@ -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..34f38f7 100644 --- a/src/H5MMprivate.h +++ b/src/H5MMprivate.h @@ -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..da55443 100644 --- a/src/H5MMpublic.h +++ b/src/H5MMpublic.h @@ -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..aa43dc7 100644 --- a/src/H5O.c +++ b/src/H5O.c @@ -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..4ea87e8 100644 --- a/src/H5Oattr.c +++ b/src/H5Oattr.c @@ -13,16 +13,16 @@ /* $Id$ */ #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 */ +#define H5S_PACKAGE /*suppress error about including H5Spkg */ + +#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..d83210f 100644 --- a/src/H5Ocomp.c +++ b/src/H5Ocomp.c @@ -7,11 +7,11 @@ * * 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..3b2da34 100644 --- a/src/H5Ocont.c +++ b/src/H5Ocont.c @@ -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..b16a267 100644 --- a/src/H5Oefl.c +++ b/src/H5Oefl.c @@ -7,12 +7,12 @@ */ #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..b1ef626 100644 --- a/src/H5Ofill.c +++ b/src/H5Ofill.c @@ -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..d59ee8e 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -7,12 +7,12 @@ * * 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..7c1db36 100644 --- a/src/H5Omtime.c +++ b/src/H5Omtime.c @@ -7,11 +7,11 @@ * * 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..7efd18d 100644 --- a/src/H5Oname.c +++ b/src/H5Oname.c @@ -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 @@ -40,7 +40,7 @@ const H5O_class_t H5O_NAME[1] = {{ H5O_name_copy, /*copy the native value */ H5O_name_size, /*raw message size */ H5O_name_reset, /*free internal memory */ - NULL, /* free method */ + NULL, /*free method */ NULL, /*get share method */ NULL, /*set share method */ H5O_name_debug, /*debug the message */ diff --git a/src/H5Onull.c b/src/H5Onull.c index e9611f7..d5d0a31 100644 --- a/src/H5Onull.c +++ b/src/H5Onull.c @@ -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..a12ca32 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -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..23a7346 100644 --- a/src/H5Opublic.h +++ b/src/H5Opublic.h @@ -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..a172f58 100644 --- a/src/H5Oshared.c +++ b/src/H5Oshared.c @@ -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..0138735 100644 --- a/src/H5Ostab.c +++ b/src/H5Ostab.c @@ -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 1fb0c74..d4e15b2 100644 --- a/src/H5P.c +++ b/src/H5P.c @@ -13,32 +13,32 @@ /* $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 e46dad2..537c272 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 e03d1bf..2ec2ef4 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..702b4b4 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..3ce8937 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..0d585a3 100644 --- a/src/H5Sall.c +++ b/src/H5Sall.c @@ -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..b47dd41 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -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..a0dcbb4 100644 --- a/src/H5Smpio.c +++ b/src/H5Smpio.c @@ -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..5b9f35e 100644 --- a/src/H5Snone.c +++ b/src/H5Snone.c @@ -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..eda3fa2 100644 --- a/src/H5Spkg.h +++ b/src/H5Spkg.h @@ -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..b9bcca7 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -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..5bd9ec9 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -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..2a90699 100644 --- a/src/H5T.c +++ b/src/H5T.c @@ -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..05f4b7f 100644 --- a/src/H5TB.c +++ b/src/H5TB.c @@ -58,13 +58,13 @@ /* $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) \ +#define KEYcmp(k1,k2,a) ((NULL!=compar) ? (*compar)( k1, k2, a) \ : HDmemcmp( k1, k2, 0<(a) ? (a) : HDstrlen(k1) ) ) /* Return maximum of two scalar values (use arguments w/o side effects): */ diff --git a/src/H5TBprivate.h b/src/H5TBprivate.h index 9b13bff..64d78c5 100644 --- a/src/H5TBprivate.h +++ b/src/H5TBprivate.h @@ -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..d57cc27 100644 --- a/src/H5TSprivate.h +++ b/src/H5TSprivate.h @@ -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..395e368 100644 --- a/src/H5Tbit.c +++ b/src/H5Tbit.c @@ -10,10 +10,10 @@ * 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..2fac45b 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -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..036175e 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -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..2399403 100644 --- a/src/H5Tvlen.c +++ b/src/H5Tvlen.c @@ -12,14 +12,14 @@ /* $Id$ */ -#define H5T_PACKAGE /*suppress error about including H5Tpkg */ - -#include /* Generic Functions */ -#include /* Errors */ -#include /* Global Heaps */ -#include /* IDs */ -#include /* Memory Allocation */ -#include /* Datatypes */ +#define H5T_PACKAGE /*suppress error about including H5Tpkg */ + +#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..ade8174 100644 --- a/src/H5V.c +++ b/src/H5V.c @@ -6,10 +6,10 @@ * 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..3f94536 100644 --- a/src/H5Vprivate.h +++ b/src/H5Vprivate.h @@ -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..aeff78c 100644 --- a/src/H5Z.c +++ b/src/H5Z.c @@ -7,11 +7,11 @@ * * 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..7e5b169 100644 --- a/src/H5Zdeflate.c +++ b/src/H5Zdeflate.c @@ -5,10 +5,10 @@ * 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..37bd4eb 100644 --- a/src/H5Zprivate.h +++ b/src/H5Zprivate.h @@ -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..7f2a13c 100644 --- a/src/H5detect.c +++ b/src/H5detect.c @@ -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 a98f0ba..7490533 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -12,7 +12,8 @@ */ #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 +22,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 @@ -136,13 +137,13 @@ # include #endif #ifdef H5_HAVE_WINDOWS_H -#include +# include #endif #ifdef WIN32 -#include -#include -#include +# include +# include +# include #endif #ifndef F_OK # define F_OK 00 @@ -923,7 +924,7 @@ extern char H5_lib_vers_info_g[]; #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 ad607f4..7dd6eab 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 917cd5f..6fc71ed 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 diff --git a/test/big.c b/test/big.c index 0cc1f12..a35d974 100644 --- a/test/big.c +++ b/test/big.c @@ -5,7 +5,7 @@ * Programmer: Robb Matzke * Wednesday, April 8, 1998 */ -#include +#include "h5test.h" const char *FILENAME[] = { "big", diff --git a/test/bittests.c b/test/bittests.c index a8b8471..3469e2d 100644 --- a/test/bittests.c +++ b/test/bittests.c @@ -7,10 +7,10 @@ * * Purpose: Tests functions in H5Tbit.c */ -#include +#include "h5test.h" #define H5T_PACKAGE -#include +#include "H5Tpkg.h" #define NTESTS 100000 diff --git a/test/chunk.c b/test/chunk.c index 0538543..47cd4db 100644 --- a/test/chunk.c +++ b/test/chunk.c @@ -12,7 +12,7 @@ /* See H5private.h for how to include headers */ #undef NDEBUG -#include +#include "hdf5.h" #ifdef H5_STDC_HEADERS # include diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c index 4b0eb69..0fbb346 100644 --- a/test/cmpd_dset.c +++ b/test/cmpd_dset.c @@ -8,7 +8,7 @@ /* See H5private.h for how to include headers */ #undef NDEBUG -#include +#include "h5test.h" const char *FILENAME[] = { "cmpd_dset", diff --git a/test/dpss_read.c b/test/dpss_read.c index e2cd1c0..263aac6 100644 --- a/test/dpss_read.c +++ b/test/dpss_read.c @@ -15,7 +15,7 @@ 3. Read the dataset into the memory buffer. 4. Get some information about the dataset from the file. */ -#include +#include "h5test.h" #include #ifndef H5_HAVE_GRIDSTORAGE diff --git a/test/dpss_write.c b/test/dpss_write.c index 0fdb7e0..c60b0eb 100644 --- a/test/dpss_write.c +++ b/test/dpss_write.c @@ -15,7 +15,7 @@ 3. Create a local memory buffer to hold the data. 4. Write the local data to the remote dataset. */ -#include +#include "h5test.h" #ifndef H5_HAVE_GRIDSTORAGE int main(void) diff --git a/test/dsets.c b/test/dsets.c index 8653718..2642bd3 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -8,7 +8,7 @@ * Purpose: Tests the dataset interface (H5D) */ -#include +#include "h5test.h" const char *FILENAME[] = { "dataset", diff --git a/test/dtypes.c b/test/dtypes.c index 5cfb08b..48185fe 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -8,7 +8,7 @@ * Purpose: Tests the data type interface (H5T) */ -#include +#include "h5test.h" /* Number of times to run each test */ #define NTESTS 1 @@ -35,7 +35,7 @@ /* Alignment test stuff */ #ifdef TEST_ALIGNMENT #define H5T_PACKAGE -#include +#include "H5Tpkg.h" #endif #define SET_ALIGNMENT(TYPE,VAL) \ H5T_NATIVE_##TYPE##_ALIGN_g=MAX(H5T_NATIVE_##TYPE##_ALIGN_g, VAL) diff --git a/test/enum.c b/test/enum.c index 5921ef1..a0a2e6f 100644 --- a/test/enum.c +++ b/test/enum.c @@ -5,7 +5,7 @@ * Programmer: Robb Matzke * Tuesday, December 22, 1998 */ -#include +#include "h5test.h" #define CPTR(VAR,CONST) ((VAR)=(CONST),&(VAR)) const char *FILENAME[] = { diff --git a/test/extend.c b/test/extend.c index e344370..9ae8489 100644 --- a/test/extend.c +++ b/test/extend.c @@ -8,7 +8,7 @@ * Purpose: Tests extendible datasets. */ -#include +#include "h5test.h" const char *FILENAME[] = { "extend", diff --git a/test/external.c b/test/external.c index d7a4899..e9766a4 100644 --- a/test/external.c +++ b/test/external.c @@ -7,7 +7,7 @@ * * Purpose: Tests datasets stored in external raw files. */ -#include +#include "h5test.h" const char *FILENAME[] = { "extern_1", diff --git a/test/fillval.c b/test/fillval.c index 3e71ad0..c794ff9 100644 --- a/test/fillval.c +++ b/test/fillval.c @@ -7,7 +7,7 @@ * * Purpose: Tests dataset fill values. */ -#include +#include "h5test.h" /* * Define NO_FILLING if you want to compare how this test works when there is diff --git a/test/flush1.c b/test/flush1.c index 9ab18f4..c1017c5 100644 --- a/test/flush1.c +++ b/test/flush1.c @@ -11,7 +11,7 @@ * calling _exit(0) since this doesn't flush HDF5 caches but * still exits with success. */ -#include +#include "h5test.h" const char *FILENAME[] = { "flush", diff --git a/test/flush2.c b/test/flush2.c index 8e7fb24..1b1ac09 100644 --- a/test/flush2.c +++ b/test/flush2.c @@ -10,7 +10,7 @@ * as the file was flushed first. This half tries to read the * file created by the first half. */ -#include +#include "h5test.h" const char *FILENAME[] = { "flush", diff --git a/test/gass_append.c b/test/gass_append.c index 30ad6b0..6ad1afc 100644 --- a/test/gass_append.c +++ b/test/gass_append.c @@ -15,7 +15,7 @@ 3. Create a local memory buffer to hold the data. 4. Write the local data to the remote dataset. */ -#include +#include "h5test.h" #ifndef H5_HAVE_GASS int main(void) diff --git a/test/gass_read.c b/test/gass_read.c index 74a39cd..f9162ab 100644 --- a/test/gass_read.c +++ b/test/gass_read.c @@ -15,7 +15,7 @@ 3. Read the dataset into the memory buffer. 4. Get some information about the dataset from the file. */ -#include +#include "h5test.h" #include #ifndef H5_HAVE_GASS diff --git a/test/gass_write.c b/test/gass_write.c index a4cb44f..bf53471 100644 --- a/test/gass_write.c +++ b/test/gass_write.c @@ -15,7 +15,7 @@ 3. Create a local memory buffer to hold the data. 4. Write the local data to the remote dataset. */ -#include +#include "h5test.h" #ifndef H5_HAVE_GASS int main(void) diff --git a/test/gen_new_array.c b/test/gen_new_array.c index b15d9da..d623db8 100644 --- a/test/gen_new_array.c +++ b/test/gen_new_array.c @@ -16,7 +16,7 @@ * The test file should be generated on a little-endian machine with * 16-bit shorts, 32-bit floats, 32-bit ints and 64-bit doubles. */ -#include +#include "hdf5.h" #define TESTFILE "tarrnew.h5" diff --git a/test/gen_old_array.c b/test/gen_old_array.c index c307b4f..49d6f17 100644 --- a/test/gen_old_array.c +++ b/test/gen_old_array.c @@ -15,7 +15,7 @@ * The test file should be generated on a little-endian machine with * 16-bit shorts, 32-bit floats, 32-bit ints and 64-bit doubles. */ -#include +#include "hdf5.h" #define TESTFILE "tarrold.h5" diff --git a/test/gheap.c b/test/gheap.c index 7d651e5..16bd0e5 100644 --- a/test/gheap.c +++ b/test/gheap.c @@ -9,14 +9,14 @@ * collections but the collections are not related to one * another by anything that appears in the file format. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "h5test.h" +#include "H5private.h" +#include "H5Eprivate.h" +#include "H5Fprivate.h" +#include "H5Gprivate.h" +#include "H5HGprivate.h" +#include "H5Iprivate.h" +#include "H5Pprivate.h" const char *FILENAME[] = { "gheap1", diff --git a/test/h5test.c b/test/h5test.c index ac834bf..2486acb 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -10,7 +10,9 @@ */ #undef NDEBUG /*override -DNDEBUG */ -#include + +#include "h5test.h" + #ifdef WIN32 #include #endif diff --git a/test/h5test.h b/test/h5test.h index 325d1f8..f1a3dec 100644 --- a/test/h5test.h +++ b/test/h5test.h @@ -11,15 +11,15 @@ #define _H5TEST_H #undef NDEBUG -#include +#include "hdf5.h" -#include +#include "H5private.h" #ifdef STDC_HEADERS # include #endif #define H5T_PACKAGE -#include /*to turn off hardware conversions*/ +#include "H5Tpkg.h" /*to turn off hardware conversions*/ /* diff --git a/test/hyperslab.c b/test/hyperslab.c index f2eeb2b..e328977 100644 --- a/test/hyperslab.c +++ b/test/hyperslab.c @@ -11,9 +11,9 @@ * because testing general dimensionalities would require us to * rewrite much of the hyperslab stuff. */ -#include -#include -#include +#include "H5private.h" +#include "H5MMprivate.h" +#include "H5Vprivate.h" #ifndef H5_HAVE_FUNCTION #undef __FUNCTION__ diff --git a/test/iopipe.c b/test/iopipe.c index d359ed8..fc50012 100644 --- a/test/iopipe.c +++ b/test/iopipe.c @@ -8,8 +8,8 @@ /* See H5private.h for how to include headers */ #undef NDEBUG -#include -#include +#include "hdf5.h" +#include "H5private.h" #ifdef H5_STDC_HEADERS # include @@ -38,11 +38,11 @@ #endif #ifdef H5_HAVE_WINSOCK_H -#include +# include #endif #ifdef H5_HAVE_SYS_TIMEB -#include +# include #endif diff --git a/test/istore.c b/test/istore.c index 92941f3..0961bc8 100644 --- a/test/istore.c +++ b/test/istore.c @@ -9,16 +9,16 @@ */ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "h5test.h" +#include "H5private.h" +#include "H5Dprivate.h" +#include "H5Iprivate.h" +#include "H5Pprivate.h" +#include "H5Fpkg.h" +#include "H5Gprivate.h" +#include "H5MMprivate.h" +#include "H5Oprivate.h" +#include "H5Vprivate.h" const char *FILENAME[] = { "istore", diff --git a/test/lheap.c b/test/lheap.c index fc1780b..0d771cf 100644 --- a/test/lheap.c +++ b/test/lheap.c @@ -7,9 +7,9 @@ * * Purpose: Test local heaps used by symbol tables (groups). */ -#include -#include -#include +#include "h5test.h" +#include "H5HLprivate.h" +#include "H5Iprivate.h" const char *FILENAME[] = { "lheap", diff --git a/test/links.c b/test/links.c index 04a9e27..c88b22f 100644 --- a/test/links.c +++ b/test/links.c @@ -7,7 +7,7 @@ * * Purpose: Tests hard and soft (symbolic) links. */ -#include +#include "h5test.h" const char *FILENAME[] = { "links", diff --git a/test/mount.c b/test/mount.c index caaf466..73aefe5 100644 --- a/test/mount.c +++ b/test/mount.c @@ -7,7 +7,7 @@ * * Purpose: Tests file mounting. */ -#include +#include "h5test.h" const char *FILENAME[] = { "mount_1", diff --git a/test/mtime.c b/test/mtime.c index a579d93..55e0c21 100644 --- a/test/mtime.c +++ b/test/mtime.c @@ -10,7 +10,7 @@ * very OS-dependent and this test tries to figure out if it's * working properly. */ -#include +#include "h5test.h" const char *FILENAME[] = { "mtime", diff --git a/test/ohdr.c b/test/ohdr.c index 8cc61d1..69d7f10 100644 --- a/test/ohdr.c +++ b/test/ohdr.c @@ -5,15 +5,15 @@ * Programmer: Robb Matzke * Tuesday, November 24, 1998 */ -#include -#include -#include +#include "h5test.h" +#include "H5Iprivate.h" +#include "H5Oprivate.h" /* * This file needs to access private datatypes from the H5G package. */ #define H5G_PACKAGE -#include +#include "H5Gpkg.h" const char *FILENAME[] = { "ohdr", diff --git a/test/overhead.c b/test/overhead.c index 2e1dd23..3e2d5fc 100644 --- a/test/overhead.c +++ b/test/overhead.c @@ -10,7 +10,7 @@ /* See H5private.h for how to include headers */ #undef NDEBUG -#include +#include "hdf5.h" #ifdef H5_STDC_HEADERS # include @@ -21,7 +21,7 @@ #endif #ifdef H5_HAVE_IO_H -# include +# include #endif #ifdef H5_HAVE_UNISTD_H diff --git a/test/space_overflow.c b/test/space_overflow.c index 690b8bf..17750e6 100644 --- a/test/space_overflow.c +++ b/test/space_overflow.c @@ -14,7 +14,7 @@ * Don't forget to change H5S_MAX_RANK back to its original * value and recompile once the test file is created. */ -#include +#include "hdf5.h" /*------------------------------------------------------------------------- diff --git a/test/srb_append.c b/test/srb_append.c index 497f51b..fce361a 100644 --- a/test/srb_append.c +++ b/test/srb_append.c @@ -49,7 +49,7 @@ * absolute path. It you use SDSC server(ghidorah.sdsc.edu), your * home directory is possibly in /projects/mdas/srb/SRBVault/. */ -#include +#include "h5test.h" #ifndef H5_HAVE_SRB int main(void) diff --git a/test/srb_read.c b/test/srb_read.c index c9ce7d3..1275a3a 100644 --- a/test/srb_read.c +++ b/test/srb_read.c @@ -48,7 +48,7 @@ * absolute path. It you use SDSC server(ghidorah.sdsc.edu), your * home directory is possibly in /projects/mdas/srb/SRBVault/. */ -#include +#include "h5test.h" #ifndef H5_HAVE_SRB int main(void) diff --git a/test/srb_write.c b/test/srb_write.c index 69b9e67..7498fca 100644 --- a/test/srb_write.c +++ b/test/srb_write.c @@ -48,8 +48,7 @@ * absolute path. It you use SDSC server(ghidorah.sdsc.edu), your * home directory is possibly in /projects/mdas/srb/SRBVault/. */ - -#include +#include "h5test.h" #ifndef H5_HAVE_SRB int main(void) diff --git a/test/stab.c b/test/stab.c index 4517930..fd6c1db 100644 --- a/test/stab.c +++ b/test/stab.c @@ -5,13 +5,13 @@ * Programmer: Robb Matzke * Tuesday, November 24, 1998 */ -#include +#include "h5test.h" /* * This file needs to access private datatypes from the H5G package. */ #define H5G_PACKAGE -#include +#include "H5Gpkg.h" const char *FILENAME[] = { "stab1", diff --git a/test/stream_test.c b/test/stream_test.c index b786014..a62c5cb 100644 --- a/test/stream_test.c +++ b/test/stream_test.c @@ -33,7 +33,7 @@ */ #include -#include +#include "hdf5.h" #ifndef H5_HAVE_STREAM diff --git a/test/tarray.c b/test/tarray.c index 34047c5..7a1f27b 100644 --- a/test/tarray.c +++ b/test/tarray.c @@ -20,9 +20,9 @@ * *************************************************************/ -#include +#include "testhdf5.h" -#include +#include "hdf5.h" #define FILENAME "tarray1.h5" #define TESTFILE "tarrold.h5" diff --git a/test/tattr.c b/test/tattr.c index 7bef8df..ab1f104 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -20,9 +20,9 @@ * *************************************************************/ -#include +#include "testhdf5.h" -#include +#include "hdf5.h" #define FILENAME "tattr.h5" #define ATTR_NAME_LEN 16 diff --git a/test/testhdf5.c b/test/testhdf5.c index 83d42c4..2ab6f51 100644 --- a/test/testhdf5.c +++ b/test/testhdf5.c @@ -52,7 +52,7 @@ int num_errs = 0; int Verbosity; /* ANY new test needs to have a prototype in tproto.h */ -#include +#include "testhdf5.h" struct TestStruct { int NumErrors; diff --git a/test/testhdf5.h b/test/testhdf5.h index cc5f8b6..d60c229 100644 --- a/test/testhdf5.h +++ b/test/testhdf5.h @@ -23,8 +23,8 @@ * Include required headers. This file tests internal library functions, * so we include the private headers here. */ -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" #ifndef HDF5_TEST_MASTER extern int num_errs; diff --git a/test/tfile.c b/test/tfile.c index 469daab..f5247a9 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -20,11 +20,11 @@ * *************************************************************/ -#include +#include "testhdf5.h" -#include -#include -#include +#include "H5private.h" +#include "H5Bprivate.h" +#include "H5Pprivate.h" #define F1_USERBLOCK_SIZE (hsize_t)0 #define F1_OFFSET_SIZE sizeof(haddr_t) diff --git a/test/tgenprop.c b/test/tgenprop.c index f9db34a..50b528e 100644 --- a/test/tgenprop.c +++ b/test/tgenprop.c @@ -1,13 +1,13 @@ /**************************************************************************** - * 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$ */ @@ -20,9 +20,9 @@ * *************************************************************/ -#include +#include "testhdf5.h" -#include +#include "hdf5.h" #define FILENAME "tgenprop.h5" diff --git a/test/th5s.c b/test/th5s.c index 0053460..39ab6e4 100644 --- a/test/th5s.c +++ b/test/th5s.c @@ -20,12 +20,12 @@ * *************************************************************/ -#include +#include "testhdf5.h" -#include -#include -#include -#include +#include "H5private.h" +#include "H5Bprivate.h" +#include "H5Sprivate.h" +#include "H5Pprivate.h" #define TESTFILE "th5s.h5" #define FILE "th5s1.h5" diff --git a/test/titerate.c b/test/titerate.c index b067b88..9fd70f3 100644 --- a/test/titerate.c +++ b/test/titerate.c @@ -1,13 +1,13 @@ /**************************************************************************** - * 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$ */ @@ -20,9 +20,9 @@ * *************************************************************/ -#include +#include "testhdf5.h" -#include +#include "hdf5.h" #define FILE "titerate.h5" diff --git a/test/tmeta.c b/test/tmeta.c index 8b4c161..7f64aa0 100644 --- a/test/tmeta.c +++ b/test/tmeta.c @@ -20,10 +20,10 @@ * *************************************************************/ -#include +#include "testhdf5.h" -#include -#include +#include "H5private.h" +#include "H5Fprivate.h" #define TEST_INT16_VALUE -7641 #define TEST_UINT16_VALUE 45002 diff --git a/test/trefer.c b/test/trefer.c index a010302..1e61a6e 100644 --- a/test/trefer.c +++ b/test/trefer.c @@ -1,13 +1,13 @@ /**************************************************************************** - * 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$ */ @@ -20,9 +20,9 @@ * *************************************************************/ -#include +#include "testhdf5.h" -#include +#include "hdf5.h" #define FILE1 "trefer1.h5" #define FILE2 "trefer2.h5" diff --git a/test/tselect.c b/test/tselect.c index 1f9c329..dfc1555 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -1,13 +1,13 @@ /**************************************************************************** - * 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$ */ @@ -20,9 +20,9 @@ * *************************************************************/ -#include +#include "testhdf5.h" -#include +#include "hdf5.h" #define FILENAME "tselect.h5" diff --git a/test/ttime.c b/test/ttime.c index 8ce2cc9..fac8c0e 100644 --- a/test/ttime.c +++ b/test/ttime.c @@ -1,13 +1,13 @@ /**************************************************************************** - * 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$ */ @@ -20,9 +20,9 @@ * *************************************************************/ -#include +#include "testhdf5.h" -#include +#include "hdf5.h" #define FILE "ttime.h5" diff --git a/test/ttsafe.h b/test/ttsafe.h index 2359764..c325b16 100644 --- a/test/ttsafe.h +++ b/test/ttsafe.h @@ -19,15 +19,15 @@ #ifndef HDF5TEST_H #define HDF5TEST_H -#include +#include "hdf5.h" #include /* * Include required headers. This file tests internal library functions, * so we include the private headers here. */ -#include -#include +#include "H5private.h" +#include "H5Eprivate.h" #ifdef H5_HAVE_THREADSAFE /* Include pthread library for threadsafe tests */ diff --git a/test/tvlstr.c b/test/tvlstr.c index bab4365..88c87bd 100644 --- a/test/tvlstr.c +++ b/test/tvlstr.c @@ -1,13 +1,13 @@ /**************************************************************************** - * 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$ */ @@ -24,9 +24,9 @@ #include #endif -#include +#include "testhdf5.h" -#include +#include "hdf5.h" #define FILE "tvlstr.h5" diff --git a/test/tvltypes.c b/test/tvltypes.c index 1738bf4..2fef5f9 100644 --- a/test/tvltypes.c +++ b/test/tvltypes.c @@ -1,13 +1,13 @@ /**************************************************************************** - * 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$ */ @@ -20,9 +20,9 @@ * *************************************************************/ -#include +#include "testhdf5.h" -#include +#include "hdf5.h" #define FILENAME "tvltypes.h5" diff --git a/test/unlink.c b/test/unlink.c index fbf9f99..66c2b82 100644 --- a/test/unlink.c +++ b/test/unlink.c @@ -7,7 +7,7 @@ * * Purpose: Test H5Gunlink(). */ -#include +#include "h5test.h" const char *FILENAME[] = { "unlink", diff --git a/tools/gifconv/gif.h b/tools/gifconv/gif.h index f697881..7f1d042 100644 --- a/tools/gifconv/gif.h +++ b/tools/gifconv/gif.h @@ -6,7 +6,7 @@ #ifndef GIF_H #define GIF_H 1 -#include +#include "hdf5.h" #include #include diff --git a/tools/gifconv/gif2hdf.c b/tools/gifconv/gif2hdf.c index 0211143..76f522e 100644 --- a/tools/gifconv/gif2hdf.c +++ b/tools/gifconv/gif2hdf.c @@ -1,14 +1,12 @@ -/* #include */ +/* #include "hdf.h" */ #include "gif.h" #include #include #include + int -main(argv , argc) -int argv; -char *argc[]; +main(int argv , char *argc[]) { - GIFTOMEM GifMemoryStruct; GIFIMAGEDESC gifImageDesc; diff --git a/tools/gifconv/gif2mem.c b/tools/gifconv/gif2mem.c index 92ca8e5..127ddd6 100644 --- a/tools/gifconv/gif2mem.c +++ b/tools/gifconv/gif2mem.c @@ -22,14 +22,13 @@ \****************************************************************************/ #include #include "gif.h" -/* #include */ +/* #include "hdf.h" */ #define VERSION "1.00" extern int EndianOrder; GIFTOMEM -Gif2Mem(MemGif) -BYTE *MemGif; +Gif2Mem(BYTE *MemGif) { /* ** The gif structure outline for passing data to memory diff --git a/tools/h5dump/h5dumptst.c b/tools/h5dump/h5dumptst.c index 4e01627..01438d7 100644 --- a/tools/h5dump/h5dumptst.c +++ b/tools/h5dump/h5dumptst.c @@ -8,8 +8,9 @@ * of the expected output and update the corresponding *.ddl files. */ #include + #include "hdf5.h" -#include +#include "H5private.h" #define FILE1 "tgroup.h5" #define FILE2 "tdset.h5" diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c index 45a726f..5a2b0a1 100644 --- a/tools/h5ls/h5ls.c +++ b/tools/h5ls/h5ls.c @@ -12,8 +12,8 @@ * programming environment it declares. Other than that, h5ls only calls * HDF5 API functions (except for H5G_basename()) */ -#include -#include +#include "H5private.h" +#include "h5tools.h" /* * If defined then include the file name as part of the object name when diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c index 76eb472..8832369 100644 --- a/tools/misc/h5debug.c +++ b/tools/misc/h5debug.c @@ -16,18 +16,18 @@ */ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "H5private.h" +#include "H5Iprivate.h" +#include "H5Bprivate.h" +#include "H5Pprivate.h" +#include "H5Fpkg.h" +#include "H5Gprivate.h" +#include "H5HGprivate.h" +#include "H5HLprivate.h" +#include "H5Oprivate.h" /* File drivers */ -#include +#include "H5FDfamily.h" #define INDENT 3 #define VCOL 50 diff --git a/tools/misc/h5import.c b/tools/misc/h5import.c index e896feb..1a7f385 100644 --- a/tools/misc/h5import.c +++ b/tools/misc/h5import.c @@ -9,7 +9,8 @@ */ /* See H5private.h for how to include system headers */ -#include +#include "hdf5.h" + #ifdef H5_STDC_HEADERS # include # include @@ -27,7 +28,7 @@ #endif #ifdef WIN32 -#include +# include #endif diff --git a/tools/misc/h5repart.c b/tools/misc/h5repart.c index de7b3df..fed02bc 100644 --- a/tools/misc/h5repart.c +++ b/tools/misc/h5repart.c @@ -13,7 +13,8 @@ */ /* See H5private.h for how to include system headers */ -#include +#include "hdf5.h" + #ifdef H5_STDC_HEADERS # include # include @@ -33,23 +34,23 @@ #endif #ifdef WIN32 -#include +# include #endif #ifndef FALSE -#define FALSE 0 +# define FALSE 0 #endif #ifndef TRUE -#define TRUE 1 +# define TRUE 1 #endif -#define NAMELEN 4096 +# define NAMELEN 4096 #define GB *1024*1024*1024 #ifndef MIN -#define MIN(X,Y) ((X)<(Y)?(X):(Y)) +# define MIN(X,Y) ((X)<(Y)?(X):(Y)) #endif #ifndef MIN3 -#define MIN3(X,Y,Z) MIN(MIN(X,Y),Z) +# define MIN3(X,Y,Z) MIN(MIN(X,Y),Z) #endif diff --git a/tools/misc/pdb2hdf.c b/tools/misc/pdb2hdf.c index 7ecd28e..7269f52 100644 --- a/tools/misc/pdb2hdf.c +++ b/tools/misc/pdb2hdf.c @@ -10,7 +10,7 @@ * meta data that points into the PDB file. */ #include -#include +#include "hdf5.h" #include #include #include -- cgit v0.12