diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2015-07-21 17:00:31 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2015-07-21 17:00:31 (GMT) |
| commit | 99a90f7fd6b2a68efb5bdef5c5fcdf28a5137d68 (patch) | |
| tree | 2decca03a0648aa3cd7184878c08528e4ac73006 /tools | |
| parent | bd28a396d05511e53c44beb1bf65dcdca4545aa0 (diff) | |
| parent | f550bc0cea1da09002118fe8dc4455b18fc26717 (diff) | |
| download | hdf5-99a90f7fd6b2a68efb5bdef5c5fcdf28a5137d68.zip hdf5-99a90f7fd6b2a68efb5bdef5c5fcdf28a5137d68.tar.gz hdf5-99a90f7fd6b2a68efb5bdef5c5fcdf28a5137d68.tar.bz2 | |
[svn-r27419] Merge revisions 27394 through 27418 from trunk to vds branch.
Tested: ummon
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*/ |