summaryrefslogtreecommitdiffstats
path: root/src/H5api_adpt.h
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-06-11 19:18:52 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-06-11 19:18:52 (GMT)
commitaa4e3e3985e1e2715819c326d332e1569ac73c7b (patch)
tree77a9a9305e54d10f2937f142e4568395ee0f9208 /src/H5api_adpt.h
parentbf8942c7e9213355515344f21c8df7fd2987f09d (diff)
parentb9f2a18b5ae9adf23cac4c0336291373a25f0721 (diff)
downloadhdf5-aa4e3e3985e1e2715819c326d332e1569ac73c7b.zip
hdf5-aa4e3e3985e1e2715819c326d332e1569ac73c7b.tar.gz
hdf5-aa4e3e3985e1e2715819c326d332e1569ac73c7b.tar.bz2
[svn-r27191] Merged r26781 to r27185 from trunk
Tested on: 64-bit Ubuntu Linux VM w/ gcc 4.8.2 (C++ and Fortran 2003 also tested)
Diffstat (limited to 'src/H5api_adpt.h')
-rw-r--r--src/H5api_adpt.h21
1 files changed, 17 insertions, 4 deletions
diff --git a/src/H5api_adpt.h b/src/H5api_adpt.h
index 7602310..52167d0 100644
--- a/src/H5api_adpt.h
+++ b/src/H5api_adpt.h
@@ -21,12 +21,25 @@
#ifndef H5API_ADPT_H
#define H5API_ADPT_H
+/*
+ * Does the compiler support the __attribute__(()) syntax? It's no
+ * big deal if we don't.
+ */
#ifdef __cplusplus
-#define __attribute__(X) /*void*/
+# define H5_ATTR_FORMAT(X,Y,Z) /*void*/
+# define H5_ATTR_UNUSED /*void*/
+# define H5_ATTR_NORETURN /*void*/
+#else /* __cplusplus */
+#ifdef H5_HAVE_ATTRIBUTE
+# define H5_ATTR_FORMAT(X,Y,Z) __attribute__((format(X, Y, Z)))
+# define H5_ATTR_UNUSED __attribute__((unused))
+# define H5_ATTR_NORETURN __attribute__((noreturn))
+#else
+# define H5_ATTR_FORMAT(X,Y,Z) /*void*/
+# define H5_ATTR_UNUSED /*void*/
+# define H5_ATTR_NORETURN /*void*/
+#endif
#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