diff options
| author | David Young <dyoung@hdfgroup.org> | 2019-12-09 16:30:58 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2019-12-09 16:30:58 (GMT) |
| commit | c8f533cfc33ac743227cbed8eba361c715a2976f (patch) | |
| tree | bcae5320f80bac774647cacbbd8493604f9384d2 /hl/src/H5LTanalyze.l | |
| parent | adcf8a315e82c0848d126e7e46b662930c081896 (diff) | |
| download | hdf5-c8f533cfc33ac743227cbed8eba361c715a2976f.zip hdf5-c8f533cfc33ac743227cbed8eba361c715a2976f.tar.gz hdf5-c8f533cfc33ac743227cbed8eba361c715a2976f.tar.bz2 | |
Merge all of my changes from merge-back-to-feature-vfd_swmr-attempt-1,
including the merge of `hdffv/hdf5/develop`, back to the branch that Vailin and
I share.
Now I need to put this branch on a fork with a less confusing name than
vchoi_fork!
Diffstat (limited to 'hl/src/H5LTanalyze.l')
| -rw-r--r-- | hl/src/H5LTanalyze.l | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hl/src/H5LTanalyze.l b/hl/src/H5LTanalyze.l index b9b492e..f16455b 100644 --- a/hl/src/H5LTanalyze.l +++ b/hl/src/H5LTanalyze.l @@ -23,9 +23,10 @@ #include <hdf5.h> #include "H5LTparse.h" -/* Turn off suggest const attribute warning in gcc */ -#if __GNUC__ >= 4 && __GNUC_MINOR__ >=2 +/* Turn off suggest const & malloc attribute warnings in gcc */ +#if defined __GNUC__ && 402 <= __GNUC__ * 100 + __GNUC_MINOR__ #pragma GCC diagnostic ignored "-Wsuggest-attribute=const" +#pragma GCC diagnostic ignored "-Wsuggest-attribute=malloc" #endif int my_yyinput(char *, int); |