diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-07-22 22:09:05 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-07-22 22:09:05 (GMT) |
| commit | ed0bae78a0c8fe4ec94423730581c8e34bea6dd4 (patch) | |
| tree | fc33d321fd5d3b60dd648eb95f97789fbbd03d29 /tools | |
| parent | 479bd3c800160c024742258a82e24c16fccfb161 (diff) | |
| parent | f550bc0cea1da09002118fe8dc4455b18fc26717 (diff) | |
| download | hdf5-ed0bae78a0c8fe4ec94423730581c8e34bea6dd4.zip hdf5-ed0bae78a0c8fe4ec94423730581c8e34bea6dd4.tar.gz hdf5-ed0bae78a0c8fe4ec94423730581c8e34bea6dd4.tar.bz2 | |
[svn-r27426] svn merge -r27377:27425 https://svn.hdfgroup.uiuc.edu/hdf5/trunk
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perform/chunk.c | 4 | ||||
| -rw-r--r-- | tools/perform/overhead.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/perform/chunk.c b/tools/perform/chunk.c index 625809a..74bcc46 100644 --- a/tools/perform/chunk.c +++ b/tools/perform/chunk.c @@ -33,8 +33,8 @@ # include <string.h> #endif - -#if !defined(H5_HAVE_ATTRIBUTE) || defined __cplusplus +/* Solaris Studio defines attribute, but for the attributes we need */ +#if !defined(H5_HAVE_ATTRIBUTE) || defined __cplusplus || defined(__SUNPRO_C) # undef __attribute__ # define __attribute__(X) /*void*/ # define H5_ATTR_UNUSED /*void*/ diff --git a/tools/perform/overhead.c b/tools/perform/overhead.c index 0e9166c..0288ffa 100644 --- a/tools/perform/overhead.c +++ b/tools/perform/overhead.c @@ -46,7 +46,8 @@ # include <io.h> #endif -#ifndef H5_HAVE_ATTRIBUTE +/* Solaris Studio defines attribute, but for the attributes we need */ +#if !defined(H5_HAVE_ATTRIBUTE) || defined __cplusplus || defined(__SUNPRO_C) # undef __attribute__ # define __attribute__(X) /*void*/ # define H5_ATTR_UNUSED /*void*/ |