From b940189f7afcd9debc3381e63c11f9af2be52dab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Tue, 15 Jun 2010 21:18:31 +0000 Subject: Cleanup header file define guards. svn path=/trunk/; revision=33230 --- gtk/capture_if_details_dlg_win32.h | 5 +++++ gtk/cfilter_combo_utils.h | 5 +++++ gtk/color_utils.h | 1 + gtk/conversations_table.h | 2 ++ gtk/expert_comp_dlg.h | 5 +++++ gtk/expert_comp_table.h | 4 ++++ gtk/expert_dlg.h | 1 + gtk/file_dlg_win32.h | 2 +- gtk/filter_utils.h | 5 +++++ gtk/firewall_dlg.h | 8 ++++---- gtk/follow_stream.h | 7 ++++++- gtk/graph_analysis.h | 6 +++--- gtk/gsm_map_stat.h | 5 +++++ gtk/gui_stat_menu.h | 6 +++--- gtk/gui_stat_util.h | 7 +++---- gtk/gui_utils.h | 6 +++--- gtk/hostlist_table.h | 5 +++++ gtk/iax2_analysis.h | 6 +++--- gtk/macros_dlg.h | 11 +++++++---- gtk/main_packet_list.h | 6 +++--- gtk/main_proto_draw.h | 6 +++--- gtk/manual_addr_resolv.h | 5 +++++ gtk/mcast_stream.h | 6 +++--- gtk/mcast_stream_dlg.h | 6 +++--- gtk/menus.h | 6 +++--- gtk/mtp3_stat.h | 5 +++++ gtk/packet_history.h | 5 +++-- gtk/plugins_dlg.h | 6 +++--- gtk/rtp_analysis.h | 6 +++--- gtk/rtp_player.h | 5 +++++ gtk/rtp_stream.h | 6 +++--- gtk/rtp_stream_dlg.h | 6 +++--- gtk/sctp_stat.h | 8 ++++++-- gtk/service_response_time_table.h | 4 ++++ gtk/supported_protos_dlg.h | 6 +++--- gtk/tap_dfilter_dlg.h | 5 +++++ gtk/u3.h | 5 +++++ gtk/uat_gui.h | 6 +++--- gtk/voip_calls.h | 6 +++--- gtk/voip_calls_dlg.h | 6 +++--- 40 files changed, 148 insertions(+), 69 deletions(-) (limited to 'gtk') diff --git a/gtk/capture_if_details_dlg_win32.h b/gtk/capture_if_details_dlg_win32.h index c2f2a2da8e..0873e1bd34 100644 --- a/gtk/capture_if_details_dlg_win32.h +++ b/gtk/capture_if_details_dlg_win32.h @@ -22,6 +22,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __CAPTURE_IF_DETAILS_DLG_H__ +#define __CAPTURE_IF_DETAILS_DLG_H__ + /** @file * Capture "Interface Details" dialog box * @ingroup dialog_group @@ -38,3 +41,5 @@ extern void capture_if_details_open(char *iface); * @param iface the interface name to test */ extern gboolean capture_if_has_details(char *iface); + +#endif /* __CAPTURE_IF_DETAILS_DLG_H__ */ diff --git a/gtk/cfilter_combo_utils.h b/gtk/cfilter_combo_utils.h index 97f140fe83..f07f770222 100644 --- a/gtk/cfilter_combo_utils.h +++ b/gtk/cfilter_combo_utils.h @@ -22,6 +22,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __CFILTER_COMBO_UTILS_H__ +#define __CFILTER_COMBO_UTILS_H__ + /** @file * Capture filter combo box routines */ @@ -32,3 +35,5 @@ extern gboolean cfilter_combo_add_recent(gchar *s); #define E_CFILTER_CM_KEY "capture_filter_combo" #define E_CFILTER_FL_KEY "capture_filter_list" #define RECENT_KEY_CAPTURE_FILTER "recent.capture_filter" + +#endif /* __CFILTER_COMBO_UTILS_H__ */ diff --git a/gtk/color_utils.h b/gtk/color_utils.h index 1f28e1d1da..abea5c8912 100644 --- a/gtk/color_utils.h +++ b/gtk/color_utils.h @@ -21,6 +21,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + #ifndef __COLORS_H__ #define __COLORS_H__ diff --git a/gtk/conversations_table.h b/gtk/conversations_table.h index 1d0d2622a6..42596982a2 100644 --- a/gtk/conversations_table.h +++ b/gtk/conversations_table.h @@ -22,8 +22,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + #ifndef __CONVERSATIONS_TABLE_H__ #define __CONVERSATIONS_TABLE_H__ + #include "sat.h" /** @file diff --git a/gtk/expert_comp_dlg.h b/gtk/expert_comp_dlg.h index db87a82ef9..2f00dbed77 100644 --- a/gtk/expert_comp_dlg.h +++ b/gtk/expert_comp_dlg.h @@ -22,4 +22,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __EXPERT_COMP_DLG_H__ +#define __EXPERT_COMP_DLG_H__ + void expert_comp_dlg_cb(GtkWidget *w, gpointer d); + +#endif /* __EXPERT_COMP_DLG_H__ */ diff --git a/gtk/expert_comp_table.h b/gtk/expert_comp_table.h index 06521fb7ea..0a8b8c5367 100644 --- a/gtk/expert_comp_table.h +++ b/gtk/expert_comp_table.h @@ -25,6 +25,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __EXPERT_COMP_TABLE_H__ +#define __EXPERT_COMP_TABLE_H__ + #include #include #include @@ -86,3 +89,4 @@ void reset_error_table_data(error_equiv_table *err); */ void free_error_table_data(error_equiv_table *err); +#endif /* __EXPERT_COMP_TABLE_H__ */ diff --git a/gtk/expert_dlg.h b/gtk/expert_dlg.h index c149d90302..d15313fbac 100644 --- a/gtk/expert_dlg.h +++ b/gtk/expert_dlg.h @@ -28,6 +28,7 @@ #ifndef __EXPERT_DLG_H__ #define __EXPERT_DLG_H__ + #include typedef struct expert_tapdata_s { diff --git a/gtk/file_dlg_win32.h b/gtk/file_dlg_win32.h index 52e56fa16c..58bf8f3b1f 100644 --- a/gtk/file_dlg_win32.h +++ b/gtk/file_dlg_win32.h @@ -1,4 +1,4 @@ -/* win32-file-dlg.h +/* win32_file_dlg.h * Native Windows file dialog routines * * $Id$ diff --git a/gtk/filter_utils.h b/gtk/filter_utils.h index f03bf71f5a..9b8d31a5b5 100644 --- a/gtk/filter_utils.h +++ b/gtk/filter_utils.h @@ -21,6 +21,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __FILTER_UTILS_H__ +#define __FILTER_UTILS_H__ + #define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a)) /* Filter actions */ @@ -60,3 +63,5 @@ extern void apply_selected_filter (guint callback_action, char *filter); + +#endif /* __FILTER_UTILS_H__ */ diff --git a/gtk/firewall_dlg.h b/gtk/firewall_dlg.h index 3e04cf3446..b457f7078b 100644 --- a/gtk/firewall_dlg.h +++ b/gtk/firewall_dlg.h @@ -1,7 +1,7 @@ /* firewall_dlg.h * Produce ACL rules for various products from a packet. * - * $Id:$ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -22,11 +22,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef FIREWALL_DLG_H_INCLUDED -#define FIREWALL_DLG_H_INCLUDED +#ifndef __FIREWALL_DLG_H__ +#define __FIREWALL_DLG_H__ /* Generate ACL / firewall rules from different fields in the selected packet. */ void firewall_rule_cb(GtkWidget * w, gpointer data _U_); -#endif /* FIREWALL_DLG_H_INCLUDED */ +#endif /* __FIREWALL_DLG_H__ */ diff --git a/gtk/follow_stream.h b/gtk/follow_stream.h index 058a4d1e1b..1d4fef6362 100644 --- a/gtk/follow_stream.h +++ b/gtk/follow_stream.h @@ -1,4 +1,4 @@ -/* follow_stream.c +/* follow_stream.h * Common routines for following data streams * * $Id$ @@ -23,6 +23,9 @@ * USA. */ +#ifndef __FOLLOW_STREAM_H__ +#define __FOLLOW_STREAM_H__ + #include /* Type of follow we are doing */ @@ -108,3 +111,5 @@ gboolean follow_add_to_gtk_text(char *buffer, size_t nchars, gboolean is_server, frs_return_t follow_read_tcp_stream(follow_info_t *follow_info, gboolean (*print_line)(char *, size_t, gboolean, void *), void *arg); frs_return_t follow_read_udp_stream(follow_info_t *follow_info, gboolean (*print_line)(char *, size_t, gboolean, void *), void *arg); frs_return_t follow_read_ssl_stream(follow_info_t *follow_info, gboolean (*print_line)(char *, size_t, gboolean, void *), void *arg); + +#endif /* __FOLLOW_STREAM_H__ */ diff --git a/gtk/graph_analysis.h b/gtk/graph_analysis.h index 965b377b8d..759208c194 100644 --- a/gtk/graph_analysis.h +++ b/gtk/graph_analysis.h @@ -28,8 +28,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef GRAPH_ANALYSIS_H_INCLUDED -#define GRAPH_ANALYSIS_H_INCLUDED +#ifndef __GRAPH_ANALYSIS_H__ +#define __GRAPH_ANALYSIS_H__ #include #include @@ -130,4 +130,4 @@ void graph_analysis_update(graph_analysis_data_t* user_data); void graph_analysis_redraw(graph_analysis_data_t* user_data); -#endif /*GRAPH_ANALYSIS_H_INCLUDED*/ +#endif /* __GRAPH_ANALYSIS_H__ */ diff --git a/gtk/gsm_map_stat.h b/gtk/gsm_map_stat.h index c10bdb3b01..f5290c77ee 100644 --- a/gtk/gsm_map_stat.h +++ b/gtk/gsm_map_stat.h @@ -24,6 +24,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __GSM_MAP_STAT_H__ +#define __GSM_MAP_STAT_H__ + /** @file * Statistics for GSM MAP Operations. */ @@ -39,3 +42,5 @@ typedef struct _gsm_map_stat_t { /** Global gsm map statistic data */ extern gsm_map_stat_t gsm_map_stat; + +#endif /* __GSM_MAP_STAT_H__ */ diff --git a/gtk/gui_stat_menu.h b/gtk/gui_stat_menu.h index 5ebb810f1f..f43beebc40 100644 --- a/gtk/gui_stat_menu.h +++ b/gtk/gui_stat_menu.h @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __GTKGUISTATMENU_H__ -#define __GTKGUISTATMENU_H__ +#ifndef __GTK_STAT_MENU_H__ +#define __GTK_STAT_MENU_H__ #ifdef __cplusplus extern "C" { @@ -88,4 +88,4 @@ extern void register_stat_menu_item_stock( } #endif /* __cplusplus */ -#endif /* __GTKGUISTATMENU_H__ */ +#endif /* __GTK_STAT_MENU_H__ */ diff --git a/gtk/gui_stat_util.h b/gtk/gui_stat_util.h index 0780f582e4..64f5420aae 100644 --- a/gtk/gui_stat_util.h +++ b/gtk/gui_stat_util.h @@ -23,9 +23,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#ifndef __gtk_stat_util__ -#define __gtk_stat_util__ +#ifndef __GTK_STAT_UTIL_H__ +#define __GTK_STAT_UTIL_H__ #include @@ -63,4 +62,4 @@ extern void init_main_stat_window(GtkWidget *window, GtkWidget *mainbox, const c */ extern GtkTreeView *create_stat_table(GtkWidget *scrolled_window, GtkWidget *vbox, int columns, const stat_column *headers); -#endif +#endif /* __GUI_STAT_UTIL_H__ */ diff --git a/gtk/gui_utils.h b/gtk/gui_utils.h index 01ab031247..e75b3cd07c 100644 --- a/gtk/gui_utils.h +++ b/gtk/gui_utils.h @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __GTKGUIUI_UTIL_H__ -#define __GTKGUIUI_UTIL_H__ +#ifndef __GUI_UTILS_H__ +#define __GUI_UTILS_H__ /** @defgroup windows_group Windows * @@ -461,4 +461,4 @@ gint ws_combo_box_get_active(GtkComboBox *combo_box); void ws_combo_box_set_active(GtkComboBox *combo_box, gint idx); -#endif /* __GTKGUIUI_UTIL_H__ */ +#endif /* __GUI_UTIL__H__ */ diff --git a/gtk/hostlist_table.h b/gtk/hostlist_table.h index b738205473..a41119a90e 100644 --- a/gtk/hostlist_table.h +++ b/gtk/hostlist_table.h @@ -23,6 +23,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __HOSTLIST_TABLE_H__ +#define __HOSTLIST_TABLE_H__ + #include "sat.h" /** @file @@ -116,3 +119,5 @@ extern void init_hostlist_notebook_cb(GtkWidget *w, gpointer d); */ void add_hostlist_table_data(hostlist_table *hl, const address *addr, guint32 port, gboolean sender, int num_frames, int num_bytes, SAT_E sat, int port_type); + +#endif /* __HOSTLIST_TABLE_H__ */ diff --git a/gtk/iax2_analysis.h b/gtk/iax2_analysis.h index 624d39b6fa..cdc1a510e3 100644 --- a/gtk/iax2_analysis.h +++ b/gtk/iax2_analysis.h @@ -30,8 +30,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef IAX2_ANALYSIS_H_INCLUDED -#define IAX2_ANALYSIS_H_INCLUDED +#ifndef __IAX2_ANALYSIS_H__ +#define __IAX2_ANALYSIS_H__ #include #include @@ -116,4 +116,4 @@ extern int iax2_packet_analyse(tap_iax2_stat_t *statinfo, const struct _iax2_info_t *iax2info); -#endif /*IAX2_ANALYSIS_H_INCLUDED*/ +#endif /* __IAX2_ANALYSIS_H__ */ diff --git a/gtk/macros_dlg.h b/gtk/macros_dlg.h index b82b23ea31..52890aee32 100644 --- a/gtk/macros_dlg.h +++ b/gtk/macros_dlg.h @@ -20,7 +20,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __MACROS_DLG_H_ -#define __MACROS_DLG_H_ - void macros_dialog_cb(GtkWidget*, gpointer); -#endif + +#ifndef __MACROS_DLG_H__ +#define __MACROS_DLG_H__ + +void macros_dialog_cb(GtkWidget*, gpointer); + +#endif /* __MACROS_DLG_H__ */ diff --git a/gtk/main_packet_list.h b/gtk/main_packet_list.h index 57d1075577..6c37c5ccc1 100644 --- a/gtk/main_packet_list.h +++ b/gtk/main_packet_list.h @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __PACKET_LIST_H__ -#define __PACKET_LIST_H__ +#ifndef __MAIN_PACKET_LIST_H__ +#define __MAIN_PACKET_LIST_H__ #ifndef NEW_PACKET_LIST @@ -177,4 +177,4 @@ extern void packet_list_recent_write_all(FILE *rf); #endif /* NEW_PACKET_LIST */ -#endif /* __PACKET_LIST_H__ */ +#endif /* __MAIN_PACKET_LIST_H__ */ diff --git a/gtk/main_proto_draw.h b/gtk/main_proto_draw.h index 55c5cebca6..2c6914816b 100644 --- a/gtk/main_proto_draw.h +++ b/gtk/main_proto_draw.h @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __GTKPACKET_H__ -#define __GTKPACKET_H__ +#ifndef __MAIN_PROTO_DRAW_H__ +#define __MAIN_PROTO_DRAW_H__ /** @file * Packet tree and details panes. @@ -244,4 +244,4 @@ extern gchar *expert_color_warn_str; extern gchar *expert_color_error_str; extern gchar *expert_color_foreground_str; -#endif +#endif /* __MAIN_PROTO_DRAW_H__ */ diff --git a/gtk/manual_addr_resolv.h b/gtk/manual_addr_resolv.h index 5f196797e6..5d27201299 100644 --- a/gtk/manual_addr_resolv.h +++ b/gtk/manual_addr_resolv.h @@ -23,4 +23,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __MANUAL_ADDR_RESOLV_H__ +#define __MANUAL_ADDR_RESOLV_H__ + void manual_addr_resolv_dlg (GtkWidget *w _U_, gpointer data); + +#endif /* __MANUAL_ADDR_RESOLV_H__ */ diff --git a/gtk/mcast_stream.h b/gtk/mcast_stream.h index f28b1cab87..96899ce5c8 100644 --- a/gtk/mcast_stream.h +++ b/gtk/mcast_stream.h @@ -29,8 +29,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef Mcast_STREAM_H_INCLUDED -#define Mcast_STREAM_H_INCLUDED +#ifndef __MCAST_STREAM_H__ +#define __MCAST_STREAM_H__ #include #include @@ -146,4 +146,4 @@ void mcaststream_reset(mcaststream_tapinfo_t *tapinfo); */ void mcaststream_scan(void); -#endif /*Mcast_STREAM_H_INCLUDED*/ +#endif /* __MCAST_STREAM_H__ */ diff --git a/gtk/mcast_stream_dlg.h b/gtk/mcast_stream_dlg.h index d0cec2728e..0ab60f86d0 100644 --- a/gtk/mcast_stream_dlg.h +++ b/gtk/mcast_stream_dlg.h @@ -29,8 +29,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef Mcast_STREAM_DLG_H_INCLUDED -#define Mcast_STREAM_DLG_H_INCLUDED +#ifndef __MCAST_STREAM_DLG_H__ +#define __MCAST_STREAM_DLG_H__ #include @@ -52,4 +52,4 @@ void mcaststream_dlg_show(GList *list); */ void mcaststream_dlg_update(GList *list); -#endif /*Mcast_STREAM_DLG_H_INCLUDED*/ +#endif /* __MCAST_STREAM_DLG_H__ */ diff --git a/gtk/menus.h b/gtk/menus.h index 7793c8408d..e87575eb4f 100644 --- a/gtk/menus.h +++ b/gtk/menus.h @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __MAIN_MENU_H__ -#define __MAIN_MENU_H__ +#ifndef __MENUS_H__ +#define __MENUS_H__ #ifdef __cplusplus extern "C" { @@ -142,4 +142,4 @@ void set_menus_for_selected_packet(capture_file *cf); } #endif /* __cplusplus */ -#endif /* __MAIN_MENU_H__ */ +#endif /* __MENUS_H__ */ diff --git a/gtk/mtp3_stat.h b/gtk/mtp3_stat.h index af7ef3c0d4..4aedd65b54 100644 --- a/gtk/mtp3_stat.h +++ b/gtk/mtp3_stat.h @@ -24,6 +24,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __MTP3_STAT_H__ +#define __MTP3_STAT_H__ + /** @file * Statistics for MTP3. * @todo Could someone with more knowledge of this comment it for doxygen? @@ -48,3 +51,5 @@ typedef struct _mtp3_stat_t { extern mtp3_stat_t mtp3_stat[]; extern guint8 mtp3_num_used; + +#endif /* __MTP3_STAT_H__ */ diff --git a/gtk/packet_history.h b/gtk/packet_history.h index 1c6888b629..76469e41b9 100644 --- a/gtk/packet_history.h +++ b/gtk/packet_history.h @@ -22,7 +22,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - +#ifndef __PACKET_HISTORY_H__ +#define __PACKET_HISTORY_H__ extern void packet_history_add(gint row); @@ -32,4 +33,4 @@ extern void history_forward_cb(GtkWidget *widget, gpointer data); extern void history_back_cb(GtkWidget *widget, gpointer data); - +#endif /* __PACKET_HISTORY_H__ */ diff --git a/gtk/plugins_dlg.h b/gtk/plugins_dlg.h index 482aa80a62..652393e0ff 100644 --- a/gtk/plugins_dlg.h +++ b/gtk/plugins_dlg.h @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __GTKGUIPLUGINS_H__ -#define __GTKGUIPLUGINS_H__ +#ifndef __PLUGINS_DLG_H__ +#define __PLUGINS_DLG_H__ #ifdef __cplusplus extern "C" { @@ -35,4 +35,4 @@ GtkWidget * about_plugins_page_new(void); } #endif /* __cplusplus */ -#endif /* __GTKGUIPLUGINS_H__ */ +#endif /* __PLUGINS_DLG_H__ */ diff --git a/gtk/rtp_analysis.h b/gtk/rtp_analysis.h index 0f921e5939..28972b1e99 100644 --- a/gtk/rtp_analysis.h +++ b/gtk/rtp_analysis.h @@ -29,8 +29,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef RTP_ANALYSIS_H_INCLUDED -#define RTP_ANALYSIS_H_INCLUDED +#ifndef __RTP_ANALYSIS_H__ +#define __RTP_ANALYSIS_H__ #include #include @@ -128,4 +128,4 @@ extern int rtp_packet_analyse(tap_rtp_stat_t *statinfo, const struct _rtp_info *rtpinfo); -#endif /*RTP_ANALYSIS_H_INCLUDED*/ +#endif /* __RTP_ANALYSIS_H__ */ diff --git a/gtk/rtp_player.h b/gtk/rtp_player.h index 094d9437f7..b7edd1991b 100644 --- a/gtk/rtp_player.h +++ b/gtk/rtp_player.h @@ -33,6 +33,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __RTP_PLAYER_H__ +#define __RTP_PLAYER_H__ + #ifdef HAVE_LIBPORTAUDIO void rtp_player_init(voip_calls_tapinfo_t *voip_calls_tap); @@ -40,3 +43,5 @@ void add_rtp_packet(const struct _rtp_info *rtp_info, packet_info *pinfo); void reset_rtp_player(void); #endif /* HAVE_LIBPORTAUDIO */ + +#endif /* __RTP_PLAYER_H__ */ diff --git a/gtk/rtp_stream.h b/gtk/rtp_stream.h index 2ef9649fc2..2c2b7fc44c 100644 --- a/gtk/rtp_stream.h +++ b/gtk/rtp_stream.h @@ -25,8 +25,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef RTP_STREAM_H_INCLUDED -#define RTP_STREAM_H_INCLUDED +#ifndef __RTP_STREAM_H__ +#define __RTP_STREAM_H__ #include "rtp_analysis.h" #include @@ -157,4 +157,4 @@ gboolean rtpstream_save(rtp_stream_info_t* stream, const gchar *filename); void rtpstream_mark(rtp_stream_info_t* stream_fwd, rtp_stream_info_t* stream_rev); -#endif /*RTP_STREAM_H_INCLUDED*/ +#endif /* __RTP_STREAM_H__ */ diff --git a/gtk/rtp_stream_dlg.h b/gtk/rtp_stream_dlg.h index 47592905c3..6f3e9505bf 100644 --- a/gtk/rtp_stream_dlg.h +++ b/gtk/rtp_stream_dlg.h @@ -25,8 +25,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef RTP_STREAM_DLG_H_INCLUDED -#define RTP_STREAM_DLG_H_INCLUDED +#ifndef __RTP_STREAM_DLG_H__ +#define __RTP_STREAM_DLG_H__ #include @@ -48,4 +48,4 @@ void rtpstream_dlg_show(GList *list); */ void rtpstream_dlg_update(GList *list); -#endif /*RTP_STREAM_DLG_H_INCLUDED*/ +#endif /* __RTP_STREAM_DLG_H__ */ diff --git a/gtk/sctp_stat.h b/gtk/sctp_stat.h index 1c8d87199e..15c83c3129 100644 --- a/gtk/sctp_stat.h +++ b/gtk/sctp_stat.h @@ -21,7 +21,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + +#ifndef __SCTP_STAT_H__ +#define __SCTP_STAT_H__ + #include #include #ifndef _WIN32 @@ -405,4 +408,5 @@ void set_analyse_child(struct sctp_analyse *child); void remove_analyse_child(struct sctp_analyse *child); void sctp_set_assoc_filter(void); - + +#endif /* __SCTP_STAT_H__ */ diff --git a/gtk/service_response_time_table.h b/gtk/service_response_time_table.h index 1cc17e38e3..46da3700ee 100644 --- a/gtk/service_response_time_table.h +++ b/gtk/service_response_time_table.h @@ -24,6 +24,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __SERVICE_RESPONSE_TIME_TABLE_H__ +#define __SERVICE_RESPONSE_TIME_TABLE_H__ + #include #include "epan/nstime.h" #include "../timestats.h" @@ -96,3 +99,4 @@ void reset_srt_table_data(srt_stat_table *rst); */ void free_srt_table_data(srt_stat_table *rst); +#endif /* __SERVICE_RESPONSE_TIME_TABLE_H__ */ diff --git a/gtk/supported_protos_dlg.h b/gtk/supported_protos_dlg.h index c64b36ba0d..1ce2b6b846 100644 --- a/gtk/supported_protos_dlg.h +++ b/gtk/supported_protos_dlg.h @@ -24,8 +24,8 @@ * */ -#ifndef __SUPPORTED_DLG_H__ -#define __SUPPORTED_DLG_H__ +#ifndef __SUPPORTED_PROTOS_DLG_H__ +#define __SUPPORTED_PROTOS_DLG_H__ /** @file * "Supported Protocols" dialog box. @@ -42,4 +42,4 @@ void supported_cb(GtkWidget *widget, gpointer data); /** Redraw all the supported protos text widgets, to use a new font. */ void supported_redraw(void); -#endif +#endif /* __SUPPORTED_PROTOS_DLG_H__ */ diff --git a/gtk/tap_dfilter_dlg.h b/gtk/tap_dfilter_dlg.h index 43fe396aad..2a6ef4e275 100644 --- a/gtk/tap_dfilter_dlg.h +++ b/gtk/tap_dfilter_dlg.h @@ -23,6 +23,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __TAP_DFILTER_DLG_H__ +#define __TAP_DFILTER_DLG_H__ + /* * You can easily add a display filter dialog for your gui tap by using * the following infrastructure: @@ -71,3 +74,5 @@ void register_dfilter_stat(tap_dfilter_dlg *info, const char *name, /* This will update the titles of the dialog windows when we load a new capture file. */ void tap_dfilter_dlg_update (void); + +#endif /* __TAP_DFILTER_DLG_H__ */ diff --git a/gtk/u3.h b/gtk/u3.h index 7b1914412b..3239c69759 100644 --- a/gtk/u3.h +++ b/gtk/u3.h @@ -22,6 +22,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __GTK_U3_H__ +#define __GTK_U3_H__ + gboolean u3_active(void); void u3_runtime_info(GString *str); @@ -31,3 +34,5 @@ void u3_deregister_pid(void); char * u3_expand_device_path(char *path); char * u3_contract_device_path(char *path); + +#endif /* __GTK_U3_H__ */ diff --git a/gtk/uat_gui.h b/gtk/uat_gui.h index c030defe12..d9324462fe 100644 --- a/gtk/uat_gui.h +++ b/gtk/uat_gui.h @@ -27,9 +27,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _UAT_GUI_H_ -#define _UAT_GUI_H_ +#ifndef __UAT_GUI_H__ +#define __UAT_GUI_H__ void uat_window_cb(GtkWidget* unused, void* uat); -#endif +#endif /* __UAT_GUI_H__ */ diff --git a/gtk/voip_calls.h b/gtk/voip_calls.h index 74f1538133..804ca5f039 100644 --- a/gtk/voip_calls.h +++ b/gtk/voip_calls.h @@ -33,8 +33,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef VOIP_CALLS_H_INCLUDED -#define VOIP_CALLS_H_INCLUDED +#ifndef __VOIP_CALLS_H__ +#define __VOIP_CALLS_H__ #include #include @@ -294,4 +294,4 @@ void voip_calls_reset(voip_calls_tapinfo_t *tapinfo); void graph_analysis_data_init(void); -#endif /*VOIP_CALLS_H_INCLUDED*/ +#endif /* __VOIP_CALLS_H__ */ diff --git a/gtk/voip_calls_dlg.h b/gtk/voip_calls_dlg.h index 1c16e53ff9..2b80493c57 100644 --- a/gtk/voip_calls_dlg.h +++ b/gtk/voip_calls_dlg.h @@ -33,8 +33,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef VOIP_CALLS_DLG_H_INCLUDED -#define VOIP_CALLS_DLG_H_INCLUDED +#ifndef __VOIP_CALLS_DLG_H__ +#define __VOIP_CALLS_DLG_H__ #include @@ -49,4 +49,4 @@ void voip_calls_dlg_update(GList *list); void voip_calls_dlg_draw(void *ptr); void voip_calls_dlg_reset(void *ptr); -#endif /* VOIP_CALLS_DLG_H_INCLUDED*/ +#endif /* __VOIP_CALLS_DLG_H__ */ -- cgit v1.2.3