summaryrefslogtreecommitdiffstats
path: root/tools/perform/overhead.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-06-11 19:18:52 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-06-11 19:18:52 (GMT)
commitaa4e3e3985e1e2715819c326d332e1569ac73c7b (patch)
tree77a9a9305e54d10f2937f142e4568395ee0f9208 /tools/perform/overhead.c
parentbf8942c7e9213355515344f21c8df7fd2987f09d (diff)
parentb9f2a18b5ae9adf23cac4c0336291373a25f0721 (diff)
downloadhdf5-aa4e3e3985e1e2715819c326d332e1569ac73c7b.zip
hdf5-aa4e3e3985e1e2715819c326d332e1569ac73c7b.tar.gz
hdf5-aa4e3e3985e1e2715819c326d332e1569ac73c7b.tar.bz2
[svn-r27191] Merged r26781 to r27185 from trunk
Tested on: 64-bit Ubuntu Linux VM w/ gcc 4.8.2 (C++ and Fortran 2003 also tested)
Diffstat (limited to 'tools/perform/overhead.c')
-rw-r--r--tools/perform/overhead.c6
1 files changed, 3 insertions, 3 deletions
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);