diff options
author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-05-15 21:28:04 (GMT) |
---|---|---|
committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-05-15 21:28:04 (GMT) |
commit | c514abd4967c7485d8341b036ba4c3848f7fff15 (patch) | |
tree | deb4aa669aa3aca21e0ff820673a07c89faacc55 /tools | |
parent | a31d4b8619c9be7c4a0b9c8c3fcb2ffa888329ee (diff) | |
download | hdf5-c514abd4967c7485d8341b036ba4c3848f7fff15.zip hdf5-c514abd4967c7485d8341b036ba4c3848f7fff15.tar.gz hdf5-c514abd4967c7485d8341b036ba4c3848f7fff15.tar.bz2 |
[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 <hdf5_file.h>
Platforms tested:
Linux
Diffstat (limited to 'tools')
-rw-r--r-- | tools/gifconv/gif.h | 2 | ||||
-rw-r--r-- | tools/gifconv/gif2hdf.c | 8 | ||||
-rw-r--r-- | tools/gifconv/gif2mem.c | 5 | ||||
-rw-r--r-- | tools/h5dump/h5dumptst.c | 3 | ||||
-rw-r--r-- | tools/h5ls/h5ls.c | 4 | ||||
-rw-r--r-- | tools/misc/h5debug.c | 20 | ||||
-rw-r--r-- | tools/misc/h5import.c | 5 | ||||
-rw-r--r-- | tools/misc/h5repart.c | 15 | ||||
-rw-r--r-- | tools/misc/pdb2hdf.c | 2 |
9 files changed, 32 insertions, 32 deletions
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 <hdf5.h> +#include "hdf5.h" #include <stdio.h> #include <stdlib.h> 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 <hdf.h> */ +/* #include "hdf.h" */ #include "gif.h" #include <string.h> #include <stdio.h> #include <stdlib.h> + 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 <stdio.h> #include "gif.h" -/* #include <hdf.h> */ +/* #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 <limits.h> + #include "hdf5.h" -#include <H5private.h> +#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 <H5private.h> -#include <h5tools.h> +#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 <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> +#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 <H5FDfamily.h> +#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 <hdf5.h> +#include "hdf5.h" + #ifdef H5_STDC_HEADERS # include <fcntl.h> # include <string.h> @@ -27,7 +28,7 @@ #endif #ifdef WIN32 -#include <io.h> +# include <io.h> #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 <hdf5.h> +#include "hdf5.h" + #ifdef H5_STDC_HEADERS # include <ctype.h> # include <errno.h> @@ -33,23 +34,23 @@ #endif #ifdef WIN32 -#include <io.h> +# include <io.h> #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 <assert.h> -#include <hdf5.h> +#include "hdf5.h" #include <pdb.h> #include <score.h> #include <stdio.h> |