diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-09-09 21:58:10 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-09-09 21:58:21 +0000 |
| commit | ed2f332aa36479156cacfd848361ee42ee36569c (patch) | |
| tree | 42ece0b80d0ef8520795a3195aa5f5d85ca989cd /ws_diag_control.h | |
| parent | c3b1b19d042d16af6e9ee44e0998915b22b766f4 (diff) | |
Revert "Try unconditionally using the pragmas in Clang."
This reverts commit 051efd105a8404093139dd4a54620c98c4ff170e.
Reason for revert: The Clang on the macOS buildbot is 3.1, so it should
have been using the _Pragmas; perhaps it "supports" them but they don't
actually *work*, or perhaps something else is wrong.
Change-Id: Id5c3365875c694e6bd4f1a4d8d92e7581cd4585f
Reviewed-on: https://code.wireshark.org/review/29522
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ws_diag_control.h')
| -rw-r--r-- | ws_diag_control.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ws_diag_control.h b/ws_diag_control.h index 18c7d87609..b865b8c186 100644 --- a/ws_diag_control.h +++ b/ws_diag_control.h @@ -39,7 +39,7 @@ extern "C" { * Clang, so we'd use _Pragma("clang diagnostic XXX"), if it's * supported. */ -// #if WS_IS_AT_LEAST_CLANG_VERSION(2,8) + #if WS_IS_AT_LEAST_CLANG_VERSION(2,8) /* * This is Clang 2.8 or later: we can use "clang diagnostic ignored -Wxxx" * and "clang diagnostic push/pop". @@ -47,7 +47,7 @@ extern "C" { #define DIAG_PRAGMA(x) DIAG_DO_PRAGMA(clang diagnostic x) #define DIAG_OFF(x) DIAG_PRAGMA(push) DIAG_PRAGMA(ignored DIAG_JOINSTR(-W,x)) #define DIAG_ON(x) DIAG_PRAGMA(pop) -// #endif + #endif /* * Not all versions of Clang understand -Wpedantic. Clang 4.0 appears |