diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-10-16 18:04:11 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-10-16 18:04:11 (GMT) |
| commit | 366f0151ddf63b0a08c4cef7f295d78d9ecd117d (patch) | |
| tree | 2bcff4c4f4e8c4caa5dbd890ab441682a75f62bd /src/H5private.h | |
| parent | adb2fd1cc0858602046959689377dbdb60a4c3a6 (diff) | |
| parent | 370e6f3f56bafa13c19eaa292a16929a8b918120 (diff) | |
| download | hdf5-366f0151ddf63b0a08c4cef7f295d78d9ecd117d.zip hdf5-366f0151ddf63b0a08c4cef7f295d78d9ecd117d.tar.gz hdf5-366f0151ddf63b0a08c4cef7f295d78d9ecd117d.tar.bz2 | |
[svn-r24301] merge from trunk.
resolve conflicts, etc...
Diffstat (limited to 'src/H5private.h')
| -rw-r--r-- | src/H5private.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/H5private.h b/src/H5private.h index aae9dcf..6c47373 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -277,12 +277,15 @@ #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 # define __attribute__(X) /*void*/ # define UNUSED /*void*/ +# define NORETURN /*void*/ #endif #endif /* __cplusplus */ |