summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Soumagne <jsoumagne@hdfgroup.org>2018-07-16 18:41:42 (GMT)
committerJerome Soumagne <jsoumagne@hdfgroup.org>2018-07-16 18:41:42 (GMT)
commit2725634ed99d330d38f449ac92203913f1fd2c55 (patch)
tree3ae60f9cfd6e9e0c8e0f78ee48f538220334ff88
parent643593dfda47f0dfe2159ae494a1f80142da3f4e (diff)
parentd5e7134df911808bba26ac6629e1fe8324916585 (diff)
downloadhdf5-2725634ed99d330d38f449ac92203913f1fd2c55.zip
hdf5-2725634ed99d330d38f449ac92203913f1fd2c55.tar.gz
hdf5-2725634ed99d330d38f449ac92203913f1fd2c55.tar.bz2
Merge pull request #1136 in HDFFV/hdf5 from ~JSOUMAGNE/hdf5_fork:topic_sanitize_gcc48_fix to develop
* commit 'd5e7134df911808bba26ac6629e1fe8324916585': Fix evaluation of __has_attribute(no_sanitize_address) on older GCC versions
-rw-r--r--src/H5detect.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/H5detect.c b/src/H5detect.c
index 60ef656..2d33a3d 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -54,10 +54,14 @@ static const char *FileHeader = "\n\
#include "H5Tpublic.h"
#include "H5Rpublic.h"
-#if defined(__has_attribute) && __has_attribute(no_sanitize_address)
-#define HDF_NO_UBSAN __attribute__((no_sanitize_address))
+#if defined(__has_attribute)
+# if __has_attribute(no_sanitize_address)
+# define HDF_NO_UBSAN __attribute__((no_sanitize_address))
+# else
+# define HDF_NO_UBSAN
+# endif
#else
-#define HDF_NO_UBSAN
+# define HDF_NO_UBSAN
#endif
#define MAXDETECT 64