From c8246c99737c7a844f45eb0e777382cc68397d17 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Wed, 10 Feb 2021 15:32:18 +0100 Subject: [PATCH] Moving glib.h out of extern C --- caputils/capture_ifinfo.h | 4 ++-- epan/dissectors/dissectors.h | 3 +-- epan/epan.h | 3 ++- epan/prefs.h | 4 ++-- epan/value_string.h | 3 ++- epan/wmem/wmem_user_cb_int.h | 3 ++- ui/packet_range.h | 4 ++-- ui/recent.h | 3 ++- ui/rtp_media.h | 4 ++-- ui/rtp_stream.h | 3 ++- ui/taps.h | 4 ++-- ui/voip_calls.h | 3 ++- wsutil/file_util.h | 4 ++-- wsutil/plugins.h | 3 ++- 14 files changed, 27 insertions(+), 21 deletions(-) diff --git a/caputils/capture_ifinfo.h b/caputils/capture_ifinfo.h index 8e42b64..0e2c792 100644 --- a/caputils/capture_ifinfo.h +++ b/caputils/capture_ifinfo.h @@ -10,12 +10,12 @@ #ifndef __CAPTURE_IFINFO_H__ #define __CAPTURE_IFINFO_H__ +#include + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#include - typedef enum { IF_WIRED, IF_AIRPCAP, diff --git a/epan/dissectors/dissectors.h b/epan/dissectors/dissectors.h index 5ff81d2..15b510d 100644 --- a/epan/dissectors/dissectors.h +++ b/epan/dissectors/dissectors.h @@ -11,14 +11,13 @@ #ifndef __DISSECTOR_REGISTER_H__ #define __DISSECTOR_REGISTER_H__ +#include #include "ws_symbol_export.h" #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#include - typedef struct _dissector_reg { const char *cb_name; void (*cb_func)(void); diff --git a/epan/epan.h b/epan/epan.h index 67e54dc..95f47f8 100644 --- a/epan/epan.h +++ b/epan/epan.h @@ -10,11 +10,12 @@ #ifndef __EPAN_H__ #define __EPAN_H__ +#include + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#include #include #include #include diff --git a/epan/prefs.h b/epan/prefs.h index 7010a45..29e4eaf 100644 --- a/epan/prefs.h +++ b/epan/prefs.h @@ -11,12 +11,12 @@ #ifndef __PREFS_H__ #define __PREFS_H__ +#include + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#include - #include #include diff --git a/epan/value_string.h b/epan/value_string.h index 5fccabb..e6ddd1a 100644 --- a/epan/value_string.h +++ b/epan/value_string.h @@ -11,11 +11,12 @@ #ifndef __VALUE_STRING_H__ #define __VALUE_STRING_H__ +#include + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#include #include "ws_symbol_export.h" #include "wmem/wmem.h" diff --git a/epan/wmem/wmem_user_cb_int.h b/epan/wmem/wmem_user_cb_int.h index 79ff154..ae51917 100644 --- a/epan/wmem/wmem_user_cb_int.h +++ b/epan/wmem/wmem_user_cb_int.h @@ -12,11 +12,12 @@ #ifndef __WMEM_USER_CB_INT_H__ #define __WMEM_USER_CB_INT_H__ +#include + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#include #include "wmem_user_cb.h" WS_DLL_LOCAL diff --git a/ui/packet_range.h b/ui/packet_range.h index 9b0b5eb..e9b63c0 100644 --- a/ui/packet_range.h +++ b/ui/packet_range.h @@ -13,12 +13,12 @@ #ifndef __PACKET_RANGE_H__ #define __PACKET_RANGE_H__ +#include + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#include - #include #include diff --git a/ui/recent.h b/ui/recent.h index cfafcc6..a29b681 100644 --- a/ui/recent.h +++ b/ui/recent.h @@ -12,11 +12,12 @@ #ifndef __RECENT_H__ #define __RECENT_H__ +#include + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#include #include #include "epan/timestamp.h" #include "ui/ws_ui_util.h" diff --git a/ui/rtp_media.h b/ui/rtp_media.h index 3842582..2693b56 100644 --- a/ui/rtp_media.h +++ b/ui/rtp_media.h @@ -14,6 +14,8 @@ #ifndef __RTP_MEDIA_H__ #define __RTP_MEDIA_H__ +#include + /** @file * "RTP Player" dialog box common routines. * @ingroup main_ui_group @@ -23,8 +25,6 @@ extern "C" { #endif /* __cplusplus */ -#include - /****************************************************************************/ /* INTERFACE */ /****************************************************************************/ diff --git a/ui/rtp_stream.h b/ui/rtp_stream.h index f280879..65754a2 100644 --- a/ui/rtp_stream.h +++ b/ui/rtp_stream.h @@ -14,6 +14,8 @@ #ifndef __RTP_STREAM_H__ #define __RTP_STREAM_H__ +#include + /** @file * "RTP Streams" dialog box common routines. * @ingroup main_ui_group @@ -24,7 +26,6 @@ extern "C" { #endif /* __cplusplus */ #include "tap-rtp-analysis.h" -#include #include #include "cfile.h" diff --git a/ui/taps.h b/ui/taps.h index 7718354..bc205d9 100644 --- a/ui/taps.h +++ b/ui/taps.h @@ -11,12 +11,12 @@ #ifndef __TAP_REGISTER_H__ #define __TAP_REGISTER_H__ +#include + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#include - typedef struct _tap_reg { const char *cb_name; void (*cb_func)(void); diff --git a/ui/voip_calls.h b/ui/voip_calls.h index 5a72475..3f0b76a 100644 --- a/ui/voip_calls.h +++ b/ui/voip_calls.h @@ -22,6 +22,8 @@ #ifndef __VOIP_CALLS_H__ #define __VOIP_CALLS_H__ +#include + /** @file * "VoIP Calls" dialog box common routines. * @ingroup main_ui_group @@ -31,7 +33,6 @@ extern "C" { #endif /* __cplusplus */ -#include #include #include "epan/address.h" diff --git a/wsutil/file_util.h b/wsutil/file_util.h index fe2f7ba..5d8f41a 100644 --- a/wsutil/file_util.h +++ b/wsutil/file_util.h @@ -11,14 +11,14 @@ #ifndef __FILE_UTIL_H__ #define __FILE_UTIL_H__ +#include + #include "ws_symbol_export.h" #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#include - #ifdef _WIN32 #include /* for _read(), _write(), etc. */ #include diff --git a/wsutil/plugins.h b/wsutil/plugins.h index 49c221e..1a76c78 100644 --- a/wsutil/plugins.h +++ b/wsutil/plugins.h @@ -11,11 +11,12 @@ #ifndef __PLUGINS_H__ #define __PLUGINS_H__ +#include + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#include #include #include "ws_symbol_export.h" -- GitLab