diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2015-06-11 19:18:52 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2015-06-11 19:18:52 (GMT) |
commit | aa4e3e3985e1e2715819c326d332e1569ac73c7b (patch) | |
tree | 77a9a9305e54d10f2937f142e4568395ee0f9208 /test/ttsafe_cancel.c | |
parent | bf8942c7e9213355515344f21c8df7fd2987f09d (diff) | |
parent | b9f2a18b5ae9adf23cac4c0336291373a25f0721 (diff) | |
download | hdf5-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 'test/ttsafe_cancel.c')
-rw-r--r-- | test/ttsafe_cancel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/ttsafe_cancel.c b/test/ttsafe_cancel.c index d8ed462..9bbec34 100644 --- a/test/ttsafe_cancel.c +++ b/test/ttsafe_cancel.c @@ -120,7 +120,7 @@ void tts_cancel(void) assert(ret==0); } -void *tts_cancel_thread(void UNUSED *arg) +void *tts_cancel_thread(void H5_ATTR_UNUSED *arg) { int datavalue; int buffer; @@ -182,8 +182,8 @@ void *tts_cancel_thread(void UNUSED *arg) return NULL; } -herr_t tts_cancel_callback(void *elem, hid_t UNUSED type_id, unsigned UNUSED ndim, - const hsize_t UNUSED *point, void *operator_data) +herr_t tts_cancel_callback(void *elem, hid_t H5_ATTR_UNUSED type_id, unsigned H5_ATTR_UNUSED ndim, + const hsize_t H5_ATTR_UNUSED *point, void *operator_data) { int value = *(int *)elem; hid_t dataset = *(hid_t *)operator_data; |