summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMohamad Chaarawi <chaarawi@hdfgroup.org>2015-05-26 14:35:09 (GMT)
committerMohamad Chaarawi <chaarawi@hdfgroup.org>2015-05-26 14:35:09 (GMT)
commit644b9071c0e1cdbd6878e94e479c95080ba843e6 (patch)
treeb026b655ab6d1b8be46eb685ef970e2e8a8daad4 /src
parentc65afd94acf959ab6bdee30dea5270f3ef072e1b (diff)
downloadhdf5-644b9071c0e1cdbd6878e94e479c95080ba843e6.zip
hdf5-644b9071c0e1cdbd6878e94e479c95080ba843e6.tar.gz
hdf5-644b9071c0e1cdbd6878e94e479c95080ba843e6.tar.bz2
[svn-r27112] merge 27111 from trunk:
move undef of __attribute__ back to private and remove its usage from public routines.
Diffstat (limited to 'src')
-rw-r--r--src/H5Epublic.h2
-rw-r--r--src/H5api_adpt.h7
-rw-r--r--src/H5private.h2
3 files changed, 3 insertions, 8 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 fce5474..2c36aee 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -280,6 +280,7 @@
* big deal if we don't.
*/
#ifdef __cplusplus
+# define __attribute__(X) /*void*/
# define UNUSED /*void*/
# define NORETURN /*void*/
#else /* __cplusplus */
@@ -287,6 +288,7 @@
# define UNUSED __attribute__((unused))
# define NORETURN __attribute__((noreturn))
#else
+# define __attribute__(X) /*void*/
# define UNUSED /*void*/
# define NORETURN /*void*/
#endif