diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-13 14:31:22 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-13 14:31:22 (GMT) |
| commit | af9d015f46336c049b81667f104d0e0bc9ec90fc (patch) | |
| tree | f29e7128113d014fe141ad1babec3d919de67f63 | |
| parent | 836d531494d4d6efad3416585e87bdf625ac4ffc (diff) | |
| download | hdf5-af9d015f46336c049b81667f104d0e0bc9ec90fc.zip hdf5-af9d015f46336c049b81667f104d0e0bc9ec90fc.tar.gz hdf5-af9d015f46336c049b81667f104d0e0bc9ec90fc.tar.bz2 | |
[svn-r18550] Description:
Bring r18548 from trunk to 1.8 branch:
Minor cleanups to compile with PGI C compiler 10.x.
Tested on:
Mac OS X/32 10.6.3 (amazon)
(tested on trunk)
| -rw-r--r-- | src/H5B2pkg.h | 2 | ||||
| -rw-r--r-- | test/cache_common.h | 2 | ||||
| -rw-r--r-- | tools/lib/h5tools_utils.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/H5B2pkg.h b/src/H5B2pkg.h index 6307187..dd8f67b 100644 --- a/src/H5B2pkg.h +++ b/src/H5B2pkg.h @@ -248,7 +248,7 @@ H5_DLLVAR const H5B2_class_t H5B2_TEST[1]; #endif /* H5B2_TESTING */ /* Array of v2 B-tree client ID -> client class mappings */ -extern const H5B2_class_t *const H5B2_client_class_g[]; +extern const H5B2_class_t *const H5B2_client_class_g[H5B2_NUM_BTREE_ID]; /******************************/ diff --git a/test/cache_common.h b/test/cache_common.h index e692a33..a13d64a 100644 --- a/test/cache_common.h +++ b/test/cache_common.h @@ -479,7 +479,7 @@ struct expected_entry_status /* global variable externs: */ -extern const char *FILENAME[]; +extern const char *FILENAME[3]; extern hbool_t write_permitted; extern hbool_t pass; /* set to false on error */ diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c index 82e9ab9..c5bc761 100644 --- a/tools/lib/h5tools_utils.c +++ b/tools/lib/h5tools_utils.c @@ -315,7 +315,7 @@ print_version(const char *progname) { printf("%s: Version %u.%u.%u%s%s\n", progname, H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE, - H5_VERS_SUBRELEASE[0] ? "-" : "", H5_VERS_SUBRELEASE); + ((char *)H5_VERS_SUBRELEASE)[0] ? "-" : "", H5_VERS_SUBRELEASE); } |