[svn-r27222] Merge of r27035-27221 from the trunk.

Tested on 64-bit linux VM:
    Serial: C++ and Fortran 2003
    Parallel: Fortran

3 files changed, 10 insertions, 10 deletions

diff --git a/tools/perform/chunk.c b/tools/perform/chunk.c
index 6825a4c..625809a 100644
--- a/tools/perform/chunk.c
+++ b/tools/perform/chunk.c
@@ -37,9 +37,9 @@
 #if !defined(H5_HAVE_ATTRIBUTE) || defined __cplusplus
 #   undef __attribute__
 #   define __attribute__(X) /*void*/
-#   define UNUSED /*void*/
+#   define H5_ATTR_UNUSED /*void*/
 #else
-#   define UNUSED __attribute__((unused))
+#   define H5_ATTR_UNUSED __attribute__((unused))
 #endif
 
 #define FILE_NAME	"chunk.h5"
@@ -78,7 +78,7 @@ static hid_t	fapl_g = -1;
 
 /* Local function prototypes */
 static size_t
-counter (unsigned UNUSED flags, size_t cd_nelmts,
+counter (unsigned H5_ATTR_UNUSED flags, size_t cd_nelmts,
 	 const unsigned *cd_values, size_t nbytes,
 	 size_t *buf_size, void **buf);
 
@@ -111,9 +111,9 @@ const H5Z_class2_t H5Z_COUNTER[1] = {{
  *-------------------------------------------------------------------------
  */
 static size_t
-counter (unsigned UNUSED flags, size_t UNUSED cd_nelmts,
-	 const unsigned UNUSED *cd_values, size_t nbytes,
-	 size_t UNUSED *buf_size, void UNUSED **buf)
+counter (unsigned H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts,
+	 const unsigned H5_ATTR_UNUSED *cd_values, size_t nbytes,
+	 size_t H5_ATTR_UNUSED *buf_size, void H5_ATTR_UNUSED **buf)
 {
     nio_g += nbytes;
     return nbytes;
diff --git a/tools/perform/overhead.c b/tools/perform/overhead.c
index 046668f..0e9166c 100644
--- a/tools/perform/overhead.c
+++ b/tools/perform/overhead.c
@@ -49,9 +49,9 @@
 #ifndef H5_HAVE_ATTRIBUTE
 #   undef __attribute__
 #   define __attribute__(X) /*void*/
-#   define UNUSED /*void*/
+#   define H5_ATTR_UNUSED /*void*/
 #else
-#   define UNUSED __attribute__((unused))
+#   define H5_ATTR_UNUSED __attribute__((unused))
 #endif
 
 #define FILE_NAME_1  "overhead.h5"
@@ -163,7 +163,7 @@ cleanup (void)
  *-------------------------------------------------------------------------
  */
 static herr_t
-display_error_cb (hid_t estack, void UNUSED *client_data)
+display_error_cb (hid_t estack, void H5_ATTR_UNUSED *client_data)
 {
     puts ("*FAILED*");
     H5Eprint2(estack, stdout);
diff --git a/tools/perform/perf.c b/tools/perform/perf.c
index 1bd33b6..afd13c0 100644
--- a/tools/perform/perf.c
+++ b/tools/perform/perf.c
@@ -473,7 +473,7 @@ parse_args(int argc, char **argv)
 #else /* H5_HAVE_PARALLEL */
 /* dummy program since H5_HAVE_PARALLEL is not configured in */
 int
-main(int UNUSED argc, char UNUSED **argv)
+main(int H5_ATTR_UNUSED argc, char H5_ATTR_UNUSED **argv)
 {
     printf("No parallel performance because parallel is not configured in\n");
     return(0);