osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Try unconditionally using the pragmas in Clang." 

This reverts commit 051efd105a.

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>
This commit is contained in:
Guy Harris 2018-09-09 21:58:10 +00:00
parent c3b1b19d04
commit ed2f332aa3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ws_diag_control.h
View File

@ -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