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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/src/H5T.c b/src/H5T.c
index 5230954..cefc1f7 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -1349,7 +1349,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-H5T_unlock_cb(void *_dt, hid_t UNUSED id, void UNUSED *key)
+H5T_unlock_cb(void *_dt, hid_t H5_ATTR_UNUSED id, void H5_ATTR_UNUSED *key)
 {
     H5T_t	*dt = (H5T_t *)_dt;