From bfd983e7f480782732db48b1302978d840e756bc Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Tue, 3 Apr 2001 13:09:16 -0500 Subject: [svn-r3770] Purpose: Update Description: Changed includes of the form: #include to #include "hdf5_file.h" so that gcc can pick them up easier without including the system header files since we don't care about them. Platforms tested: Linux --- 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 | 3 ++- test/h5test.h | 7 +++---- test/hyperslab.c | 6 +++--- test/iopipe.c | 4 ++-- 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 | 2 +- test/stab.c | 4 ++-- test/stream_test.c | 2 +- test/tarray.c | 5 ++--- test/tattr.c | 5 ++--- test/testhdf5.c | 2 +- test/testhdf5.h | 4 ++-- test/tfile.c | 8 ++++---- test/tgenprop.c | 5 ++--- test/th5s.c | 10 +++++----- test/titerate.c | 4 ++-- test/tmeta.c | 6 +++--- test/trefer.c | 4 ++-- test/tselect.c | 4 ++-- test/ttbbt.c | 1 + test/ttime.c | 4 ++-- test/ttsafe.c | 3 ++- test/ttsafe.h | 6 +++--- test/tvlstr.c | 4 ++-- test/tvltypes.c | 4 ++-- test/unlink.c | 2 +- 55 files changed, 108 insertions(+), 109 deletions(-) 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 59f16f9..eb0b0bf 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 872e102..e461cf5 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 3fc78ee..00677f1 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 ea2c818..fa63d52 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 982599c..cb9b0f6 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 c077c6a..0d17f18 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -10,7 +10,8 @@ */ #undef NDEBUG /*override -DNDEBUG */ -#include +#include "h5test.h" + #ifdef WIN32 #include #endif diff --git a/test/h5test.h b/test/h5test.h index 325d1f8..9614b30 100644 --- a/test/h5test.h +++ b/test/h5test.h @@ -11,16 +11,15 @@ #define _H5TEST_H #undef NDEBUG -#include +#include "hdf5.h" +#include "H5private.h" -#include #ifdef STDC_HEADERS # include #endif #define H5T_PACKAGE -#include /*to turn off hardware conversions*/ - +#include "H5Tpkg.h" /*to turn off hardware conversions*/ /* * This contains the filename prefix specificied as command line option for 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 152626e..94d27b9 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 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..6a86b88 100644 --- a/test/srb_write.c +++ b/test/srb_write.c @@ -49,7 +49,7 @@ * 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..bb59d72 100644 --- a/test/tarray.c +++ b/test/tarray.c @@ -20,9 +20,8 @@ * *************************************************************/ -#include - -#include +#include "testhdf5.h" +#include "hdf5.h" #define FILENAME "tarray1.h5" #define TESTFILE "tarrold.h5" diff --git a/test/tattr.c b/test/tattr.c index 7bef8df..ecdf38c 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -20,9 +20,8 @@ * *************************************************************/ -#include - -#include +#include "testhdf5.h" +#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 c9be023..c2bf726 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 8789fc5..7a4fdf5 100644 --- a/test/tgenprop.c +++ b/test/tgenprop.c @@ -20,9 +20,8 @@ * *************************************************************/ -#include - -#include +#include "testhdf5.h" +#include "hdf5.h" #define FILENAME "tgenprop.h5" diff --git a/test/th5s.c b/test/th5s.c index b29de85..df27c16 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 DATAFILE "th5s1.h5" diff --git a/test/titerate.c b/test/titerate.c index 15a39f8..ea80cf7 100644 --- a/test/titerate.c +++ b/test/titerate.c @@ -20,9 +20,9 @@ * *************************************************************/ -#include +#include "testhdf5.h" -#include +#include "hdf5.h" #define DATAFILE "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..f48f4f8 100644 --- a/test/trefer.c +++ b/test/trefer.c @@ -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..1df0fbe 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -20,9 +20,9 @@ * *************************************************************/ -#include +#include "testhdf5.h" -#include +#include "hdf5.h" #define FILENAME "tselect.h5" diff --git a/test/ttbbt.c b/test/ttbbt.c index 364f117..523341f 100644 --- a/test/ttbbt.c +++ b/test/ttbbt.c @@ -33,6 +33,7 @@ */ #include + #include "testhdf5.h" #include "H5TBprivate.h" diff --git a/test/ttime.c b/test/ttime.c index 94b82db..bfe7720 100644 --- a/test/ttime.c +++ b/test/ttime.c @@ -20,9 +20,9 @@ * *************************************************************/ -#include +#include "testhdf5.h" -#include +#include "hdf5.h" #define DATAFILE "ttime.h5" diff --git a/test/ttsafe.c b/test/ttsafe.c index 663872b..ef02bc5 100644 --- a/test/ttsafe.c +++ b/test/ttsafe.c @@ -39,7 +39,8 @@ #endif #include -#include + +#include "ttsafe.h" #ifndef H5_HAVE_THREADSAFE int main(void) diff --git a/test/ttsafe.h b/test/ttsafe.h index 2359764..458a087 100644 --- a/test/ttsafe.h +++ b/test/ttsafe.h @@ -19,15 +19,15 @@ #ifndef HDF5TEST_H #define HDF5TEST_H -#include #include /* * Include required headers. This file tests internal library functions, * so we include the private headers here. */ -#include -#include +#include "hdf5.h" +#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 6e9afd8..2ed5bb7 100644 --- a/test/tvlstr.c +++ b/test/tvlstr.c @@ -24,9 +24,9 @@ #include #endif -#include +#include "testhdf5.h" -#include +#include "hdf5.h" #define DATAFILE "tvlstr.h5" diff --git a/test/tvltypes.c b/test/tvltypes.c index 1738bf4..3dc4b3f 100644 --- a/test/tvltypes.c +++ b/test/tvltypes.c @@ -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", -- cgit v0.12