diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-09-05 17:18:00 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-09-06 08:10:56 +0000 |
| commit | d0a91b27f26762e9c998cc5e6fe71767de5d32c7 (patch) | |
| tree | 9850efb16c84537dba93ee3d6ac8b186036ae00b /wsutil | |
| parent | 143bc04ca7c11b4f5a0feef4c01627c9aee6bcd4 (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 'wsutil')
| -rw-r--r-- | wsutil/bits_count_ones.h | 2 | ||||
| -rw-r--r-- | wsutil/crash_info.h | 1 | ||||
| -rw-r--r-- | wsutil/filesystem.h | 1 | ||||
| -rw-r--r-- | wsutil/inet_addr-int.h | 2 | ||||
| -rw-r--r-- | wsutil/popcount.h | 2 | ||||
| -rw-r--r-- | wsutil/socket.h | 2 | ||||
| -rw-r--r-- | wsutil/unicode-utils.h | 2 | ||||
| -rw-r--r-- | wsutil/win32-utils.h | 2 |
8 files changed, 2 insertions, 12 deletions
diff --git a/wsutil/bits_count_ones.h b/wsutil/bits_count_ones.h index fbaf820794..1c2b28b94d 100644 --- a/wsutil/bits_count_ones.h +++ b/wsutil/bits_count_ones.h @@ -24,8 +24,6 @@ #ifndef __WSUTIL_BITS_COUNT_ONES_H__ #define __WSUTIL_BITS_COUNT_ONES_H__ -#include "config.h" - #include <glib.h> /* diff --git a/wsutil/crash_info.h b/wsutil/crash_info.h index 91818c2802..482b4fe20e 100644 --- a/wsutil/crash_info.h +++ b/wsutil/crash_info.h @@ -24,6 +24,7 @@ #define __CRASH_INFO_H__ #include "ws_symbol_export.h" +#include "ws_attributes.h" #ifdef __cplusplus extern "C" { diff --git a/wsutil/filesystem.h b/wsutil/filesystem.h index f09e5ccaea..f6c0e0899e 100644 --- a/wsutil/filesystem.h +++ b/wsutil/filesystem.h @@ -24,6 +24,7 @@ #define FILESYSTEM_H #include "ws_symbol_export.h" +#include "ws_attributes.h" #ifdef __cplusplus extern "C" { diff --git a/wsutil/inet_addr-int.h b/wsutil/inet_addr-int.h index 25f698d1df..c702a9a435 100644 --- a/wsutil/inet_addr-int.h +++ b/wsutil/inet_addr-int.h @@ -22,8 +22,6 @@ #ifndef __WS_INET_ADDR_INT_H__ #define __WS_INET_ADDR_INT_H__ -#include "config.h" - #ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> #endif diff --git a/wsutil/popcount.h b/wsutil/popcount.h index b58708f629..e23f69b4ac 100644 --- a/wsutil/popcount.h +++ b/wsutil/popcount.h @@ -22,8 +22,6 @@ #ifndef __POPCOUNT_H__ #define __POPCOUNT_H__ -#include "config.h" - #include "ws_symbol_export.h" WS_DLL_PUBLIC int popcount(unsigned int mask); diff --git a/wsutil/socket.h b/wsutil/socket.h index a26eb35363..372cd2f793 100644 --- a/wsutil/socket.h +++ b/wsutil/socket.h @@ -24,8 +24,6 @@ #ifndef __SOCKET_H__ #define __SOCKET_H__ -#include "config.h" - #if defined(_WIN32) && !defined(__CYGWIN__) #ifdef HAVE_WINDOWS_H #include <windows.h> diff --git a/wsutil/unicode-utils.h b/wsutil/unicode-utils.h index 30ec43a919..59e47f24b5 100644 --- a/wsutil/unicode-utils.h +++ b/wsutil/unicode-utils.h @@ -23,8 +23,6 @@ #ifndef __UNICODEUTIL_H__ #define __UNICODEUTIL_H__ -#include <config.h> - #include "ws_symbol_export.h" #include <glib.h> diff --git a/wsutil/win32-utils.h b/wsutil/win32-utils.h index 01026bcf8e..34705957ae 100644 --- a/wsutil/win32-utils.h +++ b/wsutil/win32-utils.h @@ -23,8 +23,6 @@ #ifndef __WIN32UTIL_H__ #define __WIN32UTIL_H__ -#include <config.h> - #include "ws_symbol_export.h" #include <glib.h> |