aboutsummaryrefslogtreecommitdiffstats
path: root/cmakeconfig.h.in
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2017-09-05 17:18:00 +0100
committerJoão Valverde <j@v6e.pt>2017-09-06 08:10:56 +0000
commitd0a91b27f26762e9c998cc5e6fe71767de5d32c7 (patch)
tree9850efb16c84537dba93ee3d6ac8b186036ae00b /cmakeconfig.h.in
parent143bc04ca7c11b4f5a0feef4c01627c9aee6bcd4 (diff)
plugins: config.h must not be included by public headers
For a sane plugin build environment. Include config.h as the first header in the .c file instead. Fix by moving required compiler attribute macros to a new "ws_attributes.h" API header. Change-Id: I34f58a927f68c1a0e59686c14d214825149749e1 Reviewed-on: https://code.wireshark.org/review/23400 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'cmakeconfig.h.in')
-rw-r--r--cmakeconfig.h.in7
1 files changed, 0 insertions, 7 deletions
diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index 2b4048a08d..a8ab22fb90 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -437,13 +437,6 @@
/* Note: not use in the code */
#cmakedefine YYTEXT_POINTER
-/* _U_ isn't needed for C++, simply don't name the variable.
- However, we do need it for some headers that are shared between C and C++. */
-#define _U_ ${C_UNUSED}
-
-/* Hint to the compiler that a function never returns */
-#define WS_NORETURN @WS_NORETURN@
-
#if defined(_WIN32)
/* WpdPack/INclude/pcap/pcap.h checks for "#if defined(WIN32)" */