aboutsummaryrefslogtreecommitdiffstats
path: root/ws_diag_control.h
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-05-22 03:37:14 +0100
committerJoão Valverde <j@v6e.pt>2016-05-22 04:55:34 +0000
commit77fd31e60a527899dfc7998f851bb8f4ab10b82b (patch)
tree3a8e7e1fe4ac3a350d6983b64f1e1668973c3f95 /ws_diag_control.h
parent1f9a2dc886ff5f8dbd6872fed5165d8a0ba20e39 (diff)
Revert "ws80211: Disable shorten-64-to-32."
This reverts commit b8f90de70efa2d271274fbb48df12737f6eddd12. Change-Id: Ic7eaf288d1937a986c2ec85ba43a94ac20b6e12e Reviewed-on: https://code.wireshark.org/review/15520 Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'ws_diag_control.h')
-rw-r--r--ws_diag_control.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/ws_diag_control.h b/ws_diag_control.h
index cc0e9eec25..be6df0353c 100644
--- a/ws_diag_control.h
+++ b/ws_diag_control.h
@@ -53,17 +53,7 @@ extern "C" {
* gcc supports "-Wpedantic".
*/
# define DIAG_PRAGMA(x) DIAG_DO_PRAGMA(GCC diagnostic x)
- /*
- * DIAG_OFF generates
- *
- * #pragma GCC diagnostic push
- * #pragma GCC diagnostic ignored "-Wpragmas"
- * #pragma GCC diagnostic ignored "-Wx-aka-the-warning-in-question"
- *
- * Ignoring "-Wpragmas" lets us turn off diagnostics for clang warnings
- * that might not be recognized by gcc.
- */
-# define DIAG_OFF(x) DIAG_PRAGMA(push) DIAG_PRAGMA(ignored DIAG_JOINSTR(-W,pragmas)) DIAG_PRAGMA(ignored DIAG_JOINSTR(-W,x))
+# define DIAG_OFF(x) DIAG_PRAGMA(push) DIAG_PRAGMA(ignored DIAG_JOINSTR(-W,x))
# define DIAG_ON(x) DIAG_PRAGMA(pop)
# endif
#elif defined(__clang__)