diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-03-25 14:40:34 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-03-25 14:40:34 (GMT) |
| commit | ae82c4361031517990b44a8b80de5d5ac2be2123 (patch) | |
| tree | 45e21bf1f2ba3a1fd69cea71c38e14155bb7db3d | |
| parent | 5d9c34406afad17f64a8feb8d5b46114286989f0 (diff) | |
| download | hdf5-ae82c4361031517990b44a8b80de5d5ac2be2123.zip hdf5-ae82c4361031517990b44a8b80de5d5ac2be2123.tar.gz hdf5-ae82c4361031517990b44a8b80de5d5ac2be2123.tar.bz2 | |
[svn-r26573] merge 24270 from trunk, introducing NORETURN.
tested with h5committest.
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | src/H5private.h | 3 | ||||
| -rw-r--r-- | tools/h5repack/h5repack_main.c | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Id: configure.ac 26520 2015-03-22 23:32:41Z hdftest . +# From configure.ac Id: configure.ac 26561 2015-03-24 22:10:02Z koziol . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for HDF5 1.8.15-snap13. # diff --git a/src/H5private.h b/src/H5private.h index c4e3d02..805eb0b 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -283,12 +283,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 */ diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c index 3d4de6f..2d896f7 100644 --- a/tools/h5repack/h5repack_main.c +++ b/tools/h5repack/h5repack_main.c @@ -21,7 +21,7 @@ #define PROGRAMNAME "h5repack" static int parse_command_line(int argc, const char **argv, pack_opt_t* options); -static void leave(int ret); +static void leave(int ret) NORETURN; /* module-scoped variables */ |