osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Moving glib.h out of extern C

This commit is contained in:
Michal Ruprich 2021-02-10 15:32:18 +01:00 committed by Wireshark GitLab Utility
parent 1eeb2c1a10
commit c8246c9973
14 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
caputils/capture_ifinfo.h
View File

@ -11,12 +11,12 @@
#ifndef __CAPTURE_IFINFO_H__ #ifndef __CAPTURE_IFINFO_H__
#define __CAPTURE_IFINFO_H__ #define __CAPTURE_IFINFO_H__
#include <glib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include <glib.h>
/* /*
* Explicitly set the interface_type enum values as these values are exposed * Explicitly set the interface_type enum values as these values are exposed
* in the preferences gui.interfaces_hidden_types string. * in the preferences gui.interfaces_hidden_types string.

4
epan/dissectors/dissectors.h
View File

@ -11,12 +11,12 @@
#ifndef __DISSECTOR_REGISTER_H__ #ifndef __DISSECTOR_REGISTER_H__
#define __DISSECTOR_REGISTER_H__ #define __DISSECTOR_REGISTER_H__
#include <glib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include <glib.h>
typedef struct _dissector_reg { typedef struct _dissector_reg {
const char *cb_name; const char *cb_name;
void (*cb_func)(void); void (*cb_func)(void);

3
epan/epan.h
View File

@ -10,11 +10,12 @@
#ifndef __EPAN_H__ #ifndef __EPAN_H__
#define __EPAN_H__ #define __EPAN_H__
#include <glib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include <glib.h>
#include <epan/tvbuff.h> #include <epan/tvbuff.h>
#include <epan/prefs.h> #include <epan/prefs.h>
#include <epan/frame_data.h> #include <epan/frame_data.h>

4
epan/prefs.h
View File

@ -11,12 +11,12 @@
#ifndef __PREFS_H__ #ifndef __PREFS_H__
#define __PREFS_H__ #define __PREFS_H__
#include <glib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include <glib.h>
#include <epan/params.h> #include <epan/params.h>
#include <epan/range.h> #include <epan/range.h>

3
epan/value_string.h
View File

@ -11,11 +11,12 @@
#ifndef __VALUE_STRING_H__ #ifndef __VALUE_STRING_H__
#define __VALUE_STRING_H__ #define __VALUE_STRING_H__
#include <glib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include <glib.h>
#include "ws_symbol_export.h" #include "ws_symbol_export.h"
#include "wmem/wmem.h" #include "wmem/wmem.h"

3
epan/wmem/wmem_user_cb_int.h
View File

@ -12,11 +12,12 @@
#ifndef __WMEM_USER_CB_INT_H__ #ifndef __WMEM_USER_CB_INT_H__
#define __WMEM_USER_CB_INT_H__ #define __WMEM_USER_CB_INT_H__
#include <glib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include <glib.h>
#include "wmem_user_cb.h" #include "wmem_user_cb.h"
WS_DLL_LOCAL WS_DLL_LOCAL

4
ui/packet_range.h
View File

@ -14,12 +14,12 @@
#ifndef __PACKET_RANGE_H__ #ifndef __PACKET_RANGE_H__
#define __PACKET_RANGE_H__ #define __PACKET_RANGE_H__
#include <glib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include <glib.h>
#include <epan/range.h> #include <epan/range.h>
#include <epan/frame_data.h> #include <epan/frame_data.h>

3
ui/recent.h
View File

@ -12,11 +12,12 @@
#ifndef __RECENT_H__ #ifndef __RECENT_H__
#define __RECENT_H__ #define __RECENT_H__
#include <glib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include <glib.h>
#include <stdio.h> #include <stdio.h>
#include "epan/timestamp.h" #include "epan/timestamp.h"
#include "ui/ws_ui_util.h" #include "ui/ws_ui_util.h"

4
ui/rtp_media.h
View File

@ -15,6 +15,8 @@
#ifndef __RTP_MEDIA_H__ #ifndef __RTP_MEDIA_H__
#define __RTP_MEDIA_H__ #define __RTP_MEDIA_H__
#include <glib.h>
/** @file /** @file
* "RTP Player" dialog box common routines. * "RTP Player" dialog box common routines.
* @ingroup main_ui_group * @ingroup main_ui_group
@ -24,8 +26,6 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include <glib.h>
/****************************************************************************/ /****************************************************************************/
/* INTERFACE */ /* INTERFACE */
/****************************************************************************/ /****************************************************************************/

3
ui/rtp_stream.h
View File

@ -14,6 +14,8 @@
#ifndef __RTP_STREAM_H__ #ifndef __RTP_STREAM_H__
#define __RTP_STREAM_H__ #define __RTP_STREAM_H__
#include <glib.h>
/** @file /** @file
* "RTP Streams" dialog box common routines. * "RTP Streams" dialog box common routines.
* @ingroup main_ui_group * @ingroup main_ui_group
@ -24,7 +26,6 @@ extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include "tap-rtp-analysis.h" #include "tap-rtp-analysis.h"
#include <glib.h>
#include <stdio.h> #include <stdio.h>
#include "cfile.h" #include "cfile.h"

4
ui/taps.h
View File

@ -11,12 +11,12 @@
#ifndef __TAPS_H__ #ifndef __TAPS_H__
#define __TAPS_H__ #define __TAPS_H__
#include <glib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include <glib.h>
#include <epan/tap.h> #include <epan/tap.h>
extern tap_reg_t tap_reg_listener[]; extern tap_reg_t tap_reg_listener[];

3
ui/voip_calls.h
View File

@ -22,6 +22,8 @@
#ifndef __VOIP_CALLS_H__ #ifndef __VOIP_CALLS_H__
#define __VOIP_CALLS_H__ #define __VOIP_CALLS_H__
#include <glib.h>
/** @file /** @file
* "VoIP Calls" dialog box common routines. * "VoIP Calls" dialog box common routines.
* @ingroup main_ui_group * @ingroup main_ui_group
@ -31,7 +33,6 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include <glib.h>
#include <stdio.h> #include <stdio.h>
#include "epan/address.h" #include "epan/address.h"

4
wsutil/file_util.h
View File

@ -11,6 +11,8 @@
#ifndef __FILE_UTIL_H__ #ifndef __FILE_UTIL_H__
#define __FILE_UTIL_H__ #define __FILE_UTIL_H__
#include <glib.h>
#include "config.h" #include "config.h"
#include "ws_symbol_export.h" #include "ws_symbol_export.h"
@ -19,8 +21,6 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include <glib.h>
#ifdef _WIN32 #ifdef _WIN32
#include <io.h> /* for _read(), _write(), etc. */ #include <io.h> /* for _read(), _write(), etc. */
#include <gmodule.h> #include <gmodule.h>

4
wsutil/plugins.h
View File

@ -11,13 +11,13 @@
#ifndef __PLUGINS_H__ #ifndef __PLUGINS_H__
#define __PLUGINS_H__ #define __PLUGINS_H__
#include <glib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include <glib.h>
#include <gmodule.h> #include <gmodule.h>
#include "ws_symbol_export.h" #include "ws_symbol_export.h"
typedef void (*plugin_register_func)(void); typedef void (*plugin_register_func)(void);