diff options
| author | Dave Beckett <dave@dajobe.org> | 2020-09-06 17:55:38 -0700 |
|---|---|---|
| committer | Dave Beckett <dave@dajobe.org> | 2020-09-06 17:55:38 -0700 |
| commit | aa2b1bb4e11f3877470f3f30ce8fa4c147318842 (patch) | |
| tree | 0a3ac2cd8ec7f51176d4a24222002b13eadcfb0e | |
| parent | 26beced24924f06233e45f4a14346d116b4ecfb0 (diff) | |
| download | raptor-aa2b1bb4e11f3877470f3f30ce8fa4c147318842.tar.gz | |
Fix GCC version check that was not working around IGNORE_FORMAT_NONLITERAL_START
| -rw-r--r-- | src/raptor_internal.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/raptor_internal.h b/src/raptor_internal.h index f566efae..1b8c0009 100644 --- a/src/raptor_internal.h +++ b/src/raptor_internal.h @@ -172,8 +172,10 @@ void raptor_sign_free(void *ptr); * cannot use #pragma in a macro * * #if defined __STDC_VERSION__ && (__STDC_VERSION__ >= 199901L) + * + * Valid for clang or GCC >= 4.9.0 */ -#if defined(__clang__) || (defined __GNUC__ && 460 <= __GNUC__ * 100 + __GNUC_MINOR__) +#if defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((4) << 16) + (9))) #define IGNORE_FORMAT_NONLITERAL_START \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wformat-nonliteral\"") |