aboutsummaryrefslogtreecommitdiffstats
path: root/ws_diag_control.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2018-09-09 14:13:27 -0700
committerGuy Harris <guy@alum.mit.edu>2018-09-09 21:14:40 +0000
commit051efd105a8404093139dd4a54620c98c4ff170e (patch)
tree8983f525040130c705aed43dd7a31c01fc5350a5 /ws_diag_control.h
parent2a0d6a7194413ce557833d258c6da8a626f7bb71 (diff)
Try unconditionally using the pragmas in Clang.
This should test whether the macOS buildbot Clang really *does* support them, in which case we should use them, or not. Change-Id: I52b7b9c450b5f7ba09df72a56ddb91b5750196dc Reviewed-on: https://code.wireshark.org/review/29521 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ws_diag_control.h')
-rw-r--r--ws_diag_control.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ws_diag_control.h b/ws_diag_control.h
index b865b8c186..18c7d87609 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