diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-09 07:32:39 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-09 07:32:39 -0500 |
| commit | e45810113b150533611c7d9cb5f0f264e00a7394 (patch) | |
| tree | 771581e87e36d6e4a4c81019c61b0dcb444c5096 /src/lib/cc/compat_compiler.h | |
| parent | a48cb9fa436720c263dd41ce501076185aeb5872 (diff) | |
| parent | 8b2041c343098052dcec03cd6eda7087bc5c7616 (diff) | |
| download | tor-e45810113b150533611c7d9cb5f0f264e00a7394.tar.gz tor-e45810113b150533611c7d9cb5f0f264e00a7394.zip | |
Merge branch 'pre_formatter_cleanups_squashed'
Diffstat (limited to 'src/lib/cc/compat_compiler.h')
| -rw-r--r-- | src/lib/cc/compat_compiler.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/cc/compat_compiler.h b/src/lib/cc/compat_compiler.h index 432487236e..47782fda08 100644 --- a/src/lib/cc/compat_compiler.h +++ b/src/lib/cc/compat_compiler.h @@ -59,8 +59,6 @@ /* Temporarily enable and disable warnings. */ #ifdef __GNUC__ -# define PRAGMA_STRINGIFY_(s) #s -# define PRAGMA_JOIN_STRINGIFY_(a,b) PRAGMA_STRINGIFY_(a ## b) /* Support for macro-generated pragmas (c99) */ # define PRAGMA_(x) _Pragma (#x) # ifdef __clang__ @@ -72,15 +70,15 @@ /* we have push/pop support */ # define DISABLE_GCC_WARNING(warningopt) \ PRAGMA_DIAGNOSTIC_(push) \ - PRAGMA_DIAGNOSTIC_(ignored PRAGMA_JOIN_STRINGIFY_(-W,warningopt)) + PRAGMA_DIAGNOSTIC_(ignored warningopt) # define ENABLE_GCC_WARNING(warningopt) \ PRAGMA_DIAGNOSTIC_(pop) #else /* !(defined(__clang__) || GCC_VERSION >= 406) */ /* older version of gcc: no push/pop support. */ # define DISABLE_GCC_WARNING(warningopt) \ - PRAGMA_DIAGNOSTIC_(ignored PRAGMA_JOIN_STRINGIFY_(-W,warningopt)) + PRAGMA_DIAGNOSTIC_(ignored warningopt) # define ENABLE_GCC_WARNING(warningopt) \ - PRAGMA_DIAGNOSTIC_(warning PRAGMA_JOIN_STRINGIFY_(-W,warningopt)) + PRAGMA_DIAGNOSTIC_(warning warningopt) #endif /* defined(__clang__) || GCC_VERSION >= 406 */ #else /* !defined(__GNUC__) */ /* not gcc at all */ |