From 3dd92875b2120db5047fd48ee0bc55fb1d1e1763 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Mon, 12 Apr 2010 21:09:48 -0500 Subject: [svn-r18548] Description: Minor cleanups to compile with PGI C compiler 10.x. Tested on: Linux 2.4/32 (jam) w/PGI 10.x C and F90 compilers --- src/H5B2pkg.h | 2 +- src/H5EApkg.h | 2 +- src/H5FApkg.h | 2 +- test/cache_common.h | 2 +- tools/lib/h5tools_utils.c | 2 +- 5 files changed, 5 insertions(+), 5 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/src/H5EApkg.h b/src/H5EApkg.h index 52baf40..f9e0c93 100644 --- a/src/H5EApkg.h +++ b/src/H5EApkg.h @@ -354,7 +354,7 @@ H5_DLLVAR const H5EA_class_t H5EA_CLS_TEST[1]; #endif /* H5EA_TESTING */ /* Array of extensible array client ID -> client class mappings */ -extern const H5EA_class_t *const H5EA_client_class_g[]; +extern const H5EA_class_t *const H5EA_client_class_g[H5EA_NUM_CLS_ID]; /******************************/ diff --git a/src/H5FApkg.h b/src/H5FApkg.h index 955855c..ddc4c59 100644 --- a/src/H5FApkg.h +++ b/src/H5FApkg.h @@ -229,7 +229,7 @@ H5_DLLVAR const H5FA_class_t H5FA_CLS_TEST[1]; #endif /* H5FA_TESTING */ /* Array of fixed array client ID -> client class mappings */ -extern const H5FA_class_t *const H5FA_client_class_g[]; +extern const H5FA_class_t *const H5FA_client_class_g[H5FA_NUM_CLS_ID]; /******************************/ diff --git a/test/cache_common.h b/test/cache_common.h index 0e20b97..9a7ac9f 100644 --- a/test/cache_common.h +++ b/test/cache_common.h @@ -516,7 +516,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); } -- cgit v0.12