diff options
author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-06-02 14:46:51 (GMT) |
---|---|---|
committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-06-02 14:46:51 (GMT) |
commit | f486fe1a495840b0da77a7642a7e572fac3a64b0 (patch) | |
tree | f1e361fa03bb72509736917c7f3ad71cd1f056ce /src/H5private.h | |
parent | 17a9efa359e335542f84dcedf5d30c87420cbd9d (diff) | |
parent | fc45d5fcb05fbf1b9ee05a46a25afc6fd6c40503 (diff) | |
download | hdf5-f486fe1a495840b0da77a7642a7e572fac3a64b0.zip hdf5-f486fe1a495840b0da77a7642a7e572fac3a64b0.tar.gz hdf5-f486fe1a495840b0da77a7642a7e572fac3a64b0.tar.bz2 |
[svn-r27137] svn merge -r27115:27135 https://svn.hdfgroup.uiuc.edu/hdf5/trunk
Diffstat (limited to 'src/H5private.h')
-rw-r--r-- | src/H5private.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/H5private.h b/src/H5private.h index 0987ce9..f7a4171 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -280,16 +280,9 @@ */ #ifdef __cplusplus # define __attribute__(X) /*void*/ -# define UNUSED /*void*/ -# define NORETURN /*void*/ #else /* __cplusplus */ -#ifdef H5_HAVE_ATTRIBUTE -# define UNUSED __attribute__((unused)) -# define NORETURN __attribute__((noreturn)) -#else +#ifndef H5_HAVE_ATTRIBUTE # define __attribute__(X) /*void*/ -# define UNUSED /*void*/ -# define NORETURN /*void*/ #endif #endif /* __cplusplus */ |