diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-05-26 14:23:27 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-05-26 14:23:27 (GMT) |
| commit | cea93c4a37a8ec0adc0dd769c9d8affc49078398 (patch) | |
| tree | cf8b3bfce94d499969a145517763f1bbfafa1015 | |
| parent | 965e459a9861326b3d3c3455c332d2bbca52bd87 (diff) | |
| download | hdf5-cea93c4a37a8ec0adc0dd769c9d8affc49078398.zip hdf5-cea93c4a37a8ec0adc0dd769c9d8affc49078398.tar.gz hdf5-cea93c4a37a8ec0adc0dd769c9d8affc49078398.tar.bz2 | |
[svn-r27111] move undef of __attribute__ back to private and remove its usage from public routines.
| -rw-r--r-- | src/H5Epublic.h | 2 | ||||
| -rw-r--r-- | src/H5api_adpt.h | 7 | ||||
| -rw-r--r-- | src/H5private.h | 2 | ||||
| -rw-r--r-- | tools/lib/h5tools_utils.h | 6 |
4 files changed, 6 insertions, 11 deletions
diff --git a/src/H5Epublic.h b/src/H5Epublic.h index 1639ab4..17a35d9 100644 --- a/src/H5Epublic.h +++ b/src/H5Epublic.h @@ -165,7 +165,7 @@ H5_DLL herr_t H5Eclose_stack(hid_t stack_id); H5_DLL ssize_t H5Eget_class_name(hid_t class_id, char *name, size_t size); H5_DLL herr_t H5Eset_current_stack(hid_t err_stack_id); H5_DLL herr_t H5Epush2(hid_t err_stack, const char *file, const char *func, unsigned line, - hid_t cls_id, hid_t maj_id, hid_t min_id, const char *msg, ...)__attribute__((format (printf, 8, 9))); + hid_t cls_id, hid_t maj_id, hid_t min_id, const char *msg, ...); H5_DLL herr_t H5Epop(hid_t err_stack, size_t count); H5_DLL herr_t H5Eprint2(hid_t err_stack, FILE *stream); H5_DLL herr_t H5Ewalk2(hid_t err_stack, H5E_direction_t direction, H5E_walk2_t func, diff --git a/src/H5api_adpt.h b/src/H5api_adpt.h index 7602310..9b00bd9 100644 --- a/src/H5api_adpt.h +++ b/src/H5api_adpt.h @@ -21,13 +21,6 @@ #ifndef H5API_ADPT_H #define H5API_ADPT_H -#ifdef __cplusplus -#define __attribute__(X) /*void*/ -#endif /* __cplusplus */ -#ifndef H5_HAVE_ATTRIBUTE -#define __attribute__(X) /*void*/ -#endif /* H5_HAVE_ATTRIBUTE */ - /* This will only be defined if HDF5 was built with CMake */ #ifdef H5_BUILT_AS_DYNAMIC_LIB diff --git a/src/H5private.h b/src/H5private.h index 66bf7eb..0987ce9 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -279,6 +279,7 @@ * big deal if we don't. */ #ifdef __cplusplus +# define __attribute__(X) /*void*/ # define UNUSED /*void*/ # define NORETURN /*void*/ #else /* __cplusplus */ @@ -286,6 +287,7 @@ # define UNUSED __attribute__((unused)) # define NORETURN __attribute__((noreturn)) #else +# define __attribute__(X) /*void*/ # define UNUSED /*void*/ # define NORETURN /*void*/ #endif diff --git a/tools/lib/h5tools_utils.h b/tools/lib/h5tools_utils.h index fd588b9..3285278 100644 --- a/tools/lib/h5tools_utils.h +++ b/tools/lib/h5tools_utils.h @@ -124,9 +124,9 @@ H5TOOLS_DLLVAR int h5tools_nCols; /*max number of columns for /* Definitions of useful routines */ H5TOOLS_DLL void indentation(int); H5TOOLS_DLL void print_version(const char *progname); -H5TOOLS_DLL void parallel_print(const char* format, ... )__attribute__((format (printf, 1, 2))); -H5TOOLS_DLL void error_msg(const char *fmt, ...)__attribute__((format (printf, 1, 2))); -H5TOOLS_DLL void warn_msg(const char *fmt, ...)__attribute__((format (printf, 1, 2))); +H5TOOLS_DLL void parallel_print(const char* format, ... ); +H5TOOLS_DLL void error_msg(const char *fmt, ...); +H5TOOLS_DLL void warn_msg(const char *fmt, ...); H5TOOLS_DLL void help_ref_msg(FILE *output); H5TOOLS_DLL void free_table(table_t *table); #ifdef H5DUMP_DEBUG |