diff options
| author | Patrick Lu <ptlu@hawkwind.ncsa.uiuc.edu> | 2000-05-03 15:48:20 (GMT) |
|---|---|---|
| committer | Patrick Lu <ptlu@hawkwind.ncsa.uiuc.edu> | 2000-05-03 15:48:20 (GMT) |
| commit | ae5c998516c2235ef1334c76718109506dcc480c (patch) | |
| tree | 19b8caf1371f1a3e53e0809caf9b24cb3cd2d731 /tools/h5ls.c | |
| parent | 043b7c4ec58fc06cc42cb62aec7741deb807c996 (diff) | |
| download | hdf5-ae5c998516c2235ef1334c76718109506dcc480c.zip hdf5-ae5c998516c2235ef1334c76718109506dcc480c.tar.gz hdf5-ae5c998516c2235ef1334c76718109506dcc480c.tar.bz2 | |
[svn-r2211] took the development branch code and moved it into the release. had to add some
conditional compile statements in the code to compile for the release.
defined a VERSION12 and VERSION13 macro. all changes were surrounded by these statements
Diffstat (limited to 'tools/h5ls.c')
| -rw-r--r-- | tools/h5ls.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tools/h5ls.c b/tools/h5ls.c index d523cf0..1cad442 100644 --- a/tools/h5ls.c +++ b/tools/h5ls.c @@ -18,11 +18,15 @@ /* * File drivers */ +#if defined VERSION13 #include <H5FDsec2.h> #include <H5FDmulti.h> #include <H5FDfamily.h> -#define NDRIVERS 10 +#elif defined VERSION12 +#include <H5Fpublic.h> +#endif +#define NDRIVERS 10 /* * If defined then include the file name as part of the object name when * printing full object names. Otherwise leave the file name off. @@ -1912,11 +1916,12 @@ main (int argc, char *argv[]) static char root_name[] = "/"; int ndrivers=0; + struct { const char *name; hid_t fapl; } driver[NDRIVERS]; - + /* Build display table */ DISPATCH(H5G_DATASET, "Dataset", H5Dopen, H5Dclose, @@ -2081,7 +2086,7 @@ main (int argc, char *argv[]) driver[ndrivers].name = "sec2"; driver[ndrivers].fapl = H5P_DEFAULT; ndrivers++; - +#if defined VERSION13 driver[ndrivers].name = "family"; driver[ndrivers].fapl = fapl = H5Pcreate(H5P_FILE_ACCESS); H5Pset_fapl_family(fapl, 0, H5P_DEFAULT); @@ -2096,7 +2101,7 @@ main (int argc, char *argv[]) driver[ndrivers].fapl = fapl = H5Pcreate(H5P_FILE_ACCESS); H5Pset_fapl_multi(fapl, NULL, NULL, NULL, NULL, TRUE); ndrivers++; - +#endif /* * Each remaining argument is an hdf5 file followed by an optional slash * and object name. |