diff options
| author | David Young <dyoung@hdfgroup.org> | 2020-01-29 19:51:52 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-01-29 19:51:52 (GMT) |
| commit | 43d41633a1ebfb77e5b7f688f31a2be20271300f (patch) | |
| tree | b4989bdaf2814eae918d379a36c2ef7fbd0e0b17 /src/H5system.c | |
| parent | 0d6e02588879a6ff2afcfabcf7090e39e59accf7 (diff) | |
| parent | fa1b2f6ef35c459c9f74ead885c119ae7f61c056 (diff) | |
| download | hdf5-43d41633a1ebfb77e5b7f688f31a2be20271300f.zip hdf5-43d41633a1ebfb77e5b7f688f31a2be20271300f.tar.gz hdf5-43d41633a1ebfb77e5b7f688f31a2be20271300f.tar.bz2 | |
Merge pull request #2318 in HDFFV/hdf5 from ~DYOUNG/werror:reduce-werror-diffs-1 to develop
* commit 'fa1b2f6ef35c459c9f74ead885c119ae7f61c056':
Reduce differences between my -Werror branch and `develop`:
Diffstat (limited to 'src/H5system.c')
| -rw-r--r-- | src/H5system.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/H5system.c b/src/H5system.c index 9310243..dd1f10d 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -107,8 +107,7 @@ static hbool_t H5_ntzset = FALSE; * format_templ in the code below, but early (4.4.7, at least) gcc only * allows diagnostic pragmas to be toggled outside of functions. */ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-nonliteral" +H5_GCC_DIAG_OFF(format-nonliteral) int HDfprintf(FILE *stream, const char *fmt, ...) { @@ -460,7 +459,7 @@ HDfprintf(FILE *stream, const char *fmt, ...) HDva_end(ap); return nout; } /* end HDfprintf() */ -#pragma GCC diagnostic pop +H5_GCC_DIAG_ON(format-nonliteral) /*------------------------------------------------------------------------- |