summaryrefslogtreecommitdiffstats
path: root/src/H5api_adpt.h
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-08-03 23:32:59 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-08-03 23:32:59 (GMT)
commitbeb4bff6686729d6eb91c6cb8014937341b42665 (patch)
tree7d6e7f8abe9400b3f78fec7013ed7979b2df62a1 /src/H5api_adpt.h
parentff5070329c34c74082570c925e2a2b9089b99b29 (diff)
downloadhdf5-beb4bff6686729d6eb91c6cb8014937341b42665.zip
hdf5-beb4bff6686729d6eb91c6cb8014937341b42665.tar.gz
hdf5-beb4bff6686729d6eb91c6cb8014937341b42665.tar.bz2
[svn-r27458] Merge of r27407 from trunk. (code cleanup for Solaris debugging)
Updated the H5_ATTR_* macros. - Updated the preprocessor logic that defines the H5_ATTR_* macros. The Solaris Studio compiler understands __attribute__ but not the specific attributes that we use. The H5_ATTR_* macros are now defined as blank with that compiler which significantly cleans up the warnings, making debugging easier. - Replaced a few lingering __attribute__ macros with H5_ATTR_* markup. Tested on: h5committest Solaris w/ Solaris Studio (emu)
Diffstat (limited to 'src/H5api_adpt.h')
-rw-r--r--src/H5api_adpt.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/H5api_adpt.h b/src/H5api_adpt.h
index 52167d0..74066f7 100644
--- a/src/H5api_adpt.h
+++ b/src/H5api_adpt.h
@@ -24,13 +24,16 @@
/*
* Does the compiler support the __attribute__(()) syntax? It's no
* big deal if we don't.
+ *
+ * Note that Solaris Studio supports attribute, but does not support the
+ * attributes we use.
*/
#ifdef __cplusplus
# define H5_ATTR_FORMAT(X,Y,Z) /*void*/
# define H5_ATTR_UNUSED /*void*/
# define H5_ATTR_NORETURN /*void*/
#else /* __cplusplus */
-#ifdef H5_HAVE_ATTRIBUTE
+#if defined(H5_HAVE_ATTRIBUTE) && !defined(__SUNPRO_C)
# define H5_ATTR_FORMAT(X,Y,Z) __attribute__((format(X, Y, Z)))
# define H5_ATTR_UNUSED __attribute__((unused))
# define H5_ATTR_NORETURN __attribute__((noreturn))