diff options
89 files changed, 0 insertions, 99 deletions
diff --git a/gtk/about_dlg.c b/gtk/about_dlg.c index 609b97a938..ac12e0f8d7 100644 --- a/gtk/about_dlg.c +++ b/gtk/about_dlg.c @@ -39,7 +39,6 @@ #include "gui_utils.h" #include "dlg_utils.h" #include "file_dlg.h" -#include "compat_macros.h" #include "globals.h" #include "log.h" #include "text_page.h" diff --git a/gtk/afp_stat.c b/gtk/afp_stat.c index 7a337d2626..12775d5372 100644 --- a/gtk/afp_stat.c +++ b/gtk/afp_stat.c @@ -43,7 +43,6 @@ #include <epan/dissectors/packet-afp.h> #include "../register.h" #include "../timestats.h" -#include "compat_macros.h" #include "../simple_dialog.h" #include "gui_utils.h" #include "dlg_utils.h" diff --git a/gtk/airpcap_gui_utils.c b/gtk/airpcap_gui_utils.c index 8044da01c5..77d839208d 100644 --- a/gtk/airpcap_gui_utils.c +++ b/gtk/airpcap_gui_utils.c @@ -45,7 +45,6 @@ #include "gui_utils.h" #include "simple_dialog.h" #include "dfilter_expr_dlg.h" -#include "compat_macros.h" #include "gtkglobals.h" #include "help_dlg.h" diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c index bf3745d92e..b5bc10dca8 100644 --- a/gtk/ansi_a_stat.c +++ b/gtk/ansi_a_stat.c @@ -53,7 +53,6 @@ #include <epan/dissectors/packet-ansi_a.h> #include "../globals.h" #include "filter_dlg.h" -#include "compat_macros.h" #include "gui_utils.h" diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c index 5ee14936a3..1b324bd569 100644 --- a/gtk/ansi_map_stat.c +++ b/gtk/ansi_map_stat.c @@ -51,7 +51,6 @@ #include "../register.h" #include "../globals.h" #include "filter_dlg.h" -#include "compat_macros.h" #include <epan/dissectors/packet-ansi_map.h> #include "gui_utils.h" diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c index 80eff1ec87..65461e8f49 100644 --- a/gtk/bootp_stat.c +++ b/gtk/bootp_stat.c @@ -39,7 +39,6 @@ #include <epan/tap.h> #include "../register.h" #include "../globals.h" -#include "compat_macros.h" #include "../stat_menu.h" #include "../tap_dfilter_dlg.h" diff --git a/gtk/camel_counter.c b/gtk/camel_counter.c index d84a1d6021..de204fbc5d 100644 --- a/gtk/camel_counter.c +++ b/gtk/camel_counter.c @@ -51,7 +51,6 @@ #include "gtk/dlg_utils.h" #include "gtk/gui_utils.h" #include "gtk/gui_stat_util.h" -#include "gtk/compat_macros.h" #include "epan/asn1.h" #include "epan/camel-persistentdata.h" diff --git a/gtk/camel_srt.c b/gtk/camel_srt.c index 9966adb96a..376b3719e2 100644 --- a/gtk/camel_srt.c +++ b/gtk/camel_srt.c @@ -51,7 +51,6 @@ #include "gtk/dlg_utils.h" #include "gtk/gui_utils.h" #include "gtk/gui_stat_util.h" -#include "gtk/compat_macros.h" #include "gtk/service_response_time_table.h" #include "epan/asn1.h" diff --git a/gtk/cfilter_combo_utils.c b/gtk/cfilter_combo_utils.c index 24907960d0..b0c1ac4a74 100644 --- a/gtk/cfilter_combo_utils.c +++ b/gtk/cfilter_combo_utils.c @@ -28,7 +28,6 @@ #include <string.h> #include <gtk/gtk.h> -#include "compat_macros.h" #include "main.h" #include "gtkglobals.h" #include "cfilter_combo_utils.h" diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c index 4aca950ed5..8e51362d64 100644 --- a/gtk/column_prefs.c +++ b/gtk/column_prefs.c @@ -33,7 +33,6 @@ #include "gtkglobals.h" #include <epan/prefs.h> #include <epan/column.h> -#include "compat_macros.h" #include "gui_utils.h" #include "packet_list.h" #include "filter_dlg.h" diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c index 2120423365..1b3232f477 100644 --- a/gtk/conversations_table.c +++ b/gtk/conversations_table.c @@ -44,7 +44,6 @@ #include <epan/tap.h> #include <epan/nstime.h> -#include "compat_macros.h" #include "sat.h" #include "conversations_table.h" #include "image/clist_ascend.xpm" diff --git a/gtk/decode_as_ber.c b/gtk/decode_as_ber.c index b83432e5bd..84a6ee16d6 100644 --- a/gtk/decode_as_ber.c +++ b/gtk/decode_as_ber.c @@ -36,7 +36,6 @@ #include <epan/ipproto.h> #include "gui_utils.h" #include <epan/epan_dissect.h> -#include "compat_macros.h" #include "decode_as_dcerpc.h" #include "decode_as_ber.h" diff --git a/gtk/decode_as_dcerpc.c b/gtk/decode_as_dcerpc.c index da2fa4e092..3309db7392 100644 --- a/gtk/decode_as_dcerpc.c +++ b/gtk/decode_as_dcerpc.c @@ -36,7 +36,6 @@ #include <epan/ipproto.h> #include "gui_utils.h" #include <epan/epan_dissect.h> -#include "compat_macros.h" #include "decode_as_dcerpc.h" #include <epan/dissectors/packet-dcerpc.h> diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c index 1fb1ba36d8..fba8914761 100644 --- a/gtk/decode_as_dlg.c +++ b/gtk/decode_as_dlg.c @@ -37,7 +37,6 @@ #include <epan/ipproto.h> #include "gui_utils.h" #include <epan/epan_dissect.h> -#include "compat_macros.h" #include "decode_as_dcerpc.h" #include "decode_as_ber.h" #include "help_dlg.h" diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c index 033b98bc50..04253a8ed2 100644 --- a/gtk/dfilter_expr_dlg.c +++ b/gtk/dfilter_expr_dlg.c @@ -55,7 +55,6 @@ #include "proto_dlg.h" #include "filter_dlg.h" #include "dfilter_expr_dlg.h" -#include "compat_macros.h" #define E_DFILTER_EXPR_TREE_KEY "dfilter_expr_tree" #define E_DFILTER_EXPR_CURRENT_VAR_KEY "dfilter_expr_current_var" diff --git a/gtk/dlg_utils.h b/gtk/dlg_utils.h index 0364a3fd93..7985bb631c 100644 --- a/gtk/dlg_utils.h +++ b/gtk/dlg_utils.h @@ -106,14 +106,4 @@ extern void dlg_set_activate(GtkWidget *widget, GtkWidget *ok_button); */ void dlg_button_focus_nth(GtkWidget *hbox, gint focus_item); -/** used by compat_macros.h only, don't use directly */ -extern GtkWidget *dlg_radio_button_new_with_label_with_mnemonic(GSList *group, - const gchar *label, GtkAccelGroup *accel_group); -/** used by compat_macros.h only, don't use directly */ -extern GtkWidget *dlg_check_button_new_with_label_with_mnemonic(const gchar *label, - GtkAccelGroup *accel_group); -/** used by compat_macros.h only, don't use directly */ -extern GtkWidget *dlg_toggle_button_new_with_label_with_mnemonic(const gchar *label, - GtkAccelGroup *accel_group); - #endif diff --git a/gtk/expert_comp_dlg.c b/gtk/expert_comp_dlg.c index c2a23de424..80b926587d 100644 --- a/gtk/expert_comp_dlg.c +++ b/gtk/expert_comp_dlg.c @@ -35,7 +35,6 @@ #include <epan/packet_info.h> #include <epan/tap.h> #include "../register.h" -#include "compat_macros.h" #include "../simple_dialog.h" #include "gui_utils.h" #include "dlg_utils.h" diff --git a/gtk/expert_comp_table.c b/gtk/expert_comp_table.c index 4f462d8640..536ff2254d 100644 --- a/gtk/expert_comp_table.c +++ b/gtk/expert_comp_table.c @@ -34,7 +34,6 @@ #include <stdio.h> #include <math.h> #include <gtk/gtk.h> -#include "compat_macros.h" #include "epan/packet_info.h" #include "expert_comp_table.h" diff --git a/gtk/expert_dlg.c b/gtk/expert_dlg.c index f99959690b..8870847d1c 100644 --- a/gtk/expert_dlg.c +++ b/gtk/expert_dlg.c @@ -38,7 +38,6 @@ #include <stdio.h> #include <math.h> #include <gtk/gtk.h> -#include "compat_macros.h" #include "epan/packet_info.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" diff --git a/gtk/export_object.c b/gtk/export_object.c index c907e2fd60..ecad23307d 100644 --- a/gtk/export_object.c +++ b/gtk/export_object.c @@ -39,7 +39,6 @@ #include <epan/packet_info.h> #include <epan/prefs.h> #include <epan/tap.h> -#include <gtk/compat_macros.h> #include <gtk/dlg_utils.h> #include <gtk/file_dlg.h> #include <gtk/gui_utils.h> diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c index aede73b3eb..2087f5dbf8 100644 --- a/gtk/fc_stat.c +++ b/gtk/fc_stat.c @@ -44,7 +44,6 @@ #include <epan/dissectors/packet-fc.h> #include "../register.h" #include "../timestats.h" -#include "compat_macros.h" #include "../simple_dialog.h" #include "gui_utils.h" #include "dlg_utils.h" diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c index b4f4c2adeb..a346da1fde 100644 --- a/gtk/file_dlg.c +++ b/gtk/file_dlg.c @@ -34,7 +34,6 @@ #include "gui_utils.h" #include "file_dlg.h" #include "keys.h" -#include "compat_macros.h" #include <string.h> #include <errno.h> diff --git a/gtk/fileset_dlg.c b/gtk/fileset_dlg.c index abf2208189..77c4a1d568 100644 --- a/gtk/fileset_dlg.c +++ b/gtk/fileset_dlg.c @@ -37,7 +37,6 @@ #include "globals.h" -#include "compat_macros.h" #include "simple_dialog.h" #include "gui_utils.h" diff --git a/gtk/firewall_dlg.c b/gtk/firewall_dlg.c index 526beb42ae..c485e075d9 100644 --- a/gtk/firewall_dlg.c +++ b/gtk/firewall_dlg.c @@ -66,7 +66,6 @@ #include <gtk/gui_utils.h> #include <epan/epan_dissect.h> #include <epan/filesystem.h> -#include <gtk/compat_macros.h> #include <epan/ipproto.h> #include <gtk/font_utils.h> #include <wiretap/file_util.h> diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c index 5807efae19..731d7951fb 100644 --- a/gtk/flow_graph.c +++ b/gtk/flow_graph.c @@ -39,7 +39,6 @@ #include "gui_stat_menu.h" #include "dlg_utils.h" #include "gui_utils.h" -#include "compat_macros.h" #include "gtkglobals.h" #include "simple_dialog.h" diff --git a/gtk/follow_ssl.c b/gtk/follow_ssl.c index 81d2d64b8b..0bea31d8ec 100644 --- a/gtk/follow_ssl.c +++ b/gtk/follow_ssl.c @@ -54,7 +54,6 @@ #include <gtk/gui_utils.h> #include <epan/epan_dissect.h> #include <epan/filesystem.h> -#include <gtk/compat_macros.h> #include <epan/ipproto.h> #include <gtk/font_utils.h> #include <wiretap/file_util.h> diff --git a/gtk/follow_tcp.c b/gtk/follow_tcp.c index ab3bac2e8d..96412518c6 100644 --- a/gtk/follow_tcp.c +++ b/gtk/follow_tcp.c @@ -62,7 +62,6 @@ #include "gui_utils.h" #include <epan/epan_dissect.h> #include <epan/filesystem.h> -#include "compat_macros.h" #include <epan/ipproto.h> #include "print_mswin.h" #include "font_utils.h" diff --git a/gtk/follow_udp.c b/gtk/follow_udp.c index d91f8d04bc..2ef0d3717a 100644 --- a/gtk/follow_udp.c +++ b/gtk/follow_udp.c @@ -37,7 +37,6 @@ #include <epan/tap.h> #include "follow_stream.h" #include <globals.h> -#include <gtk/compat_macros.h> #include <gtk/keys.h> #include <gtk/main.h> #include <simple_dialog.h> diff --git a/gtk/font_utils.c b/gtk/font_utils.c index b3b4db7cf4..53455a6ced 100644 --- a/gtk/font_utils.c +++ b/gtk/font_utils.c @@ -45,7 +45,6 @@ #include "gtkglobals.h" -#include "compat_macros.h" #include "font_utils.h" #include "simple_dialog.h" diff --git a/gtk/funnel_stat.c b/gtk/funnel_stat.c index fb32f471aa..64d7e28e5b 100644 --- a/gtk/funnel_stat.c +++ b/gtk/funnel_stat.c @@ -45,7 +45,6 @@ #include "../register.h" #include "../timestats.h" -#include "compat_macros.h" #include "../simple_dialog.h" #include "gui_utils.h" #include "dlg_utils.h" diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c index 5e156a55af..06eb498b7f 100644 --- a/gtk/goto_dlg.c +++ b/gtk/goto_dlg.c @@ -35,7 +35,6 @@ #include "goto_dlg.h" #include "simple_dialog.h" #include "dlg_utils.h" -#include "compat_macros.h" #include "gui_utils.h" #include "help_dlg.h" diff --git a/gtk/graph_analysis.c b/gtk/graph_analysis.c index 0cf11e05de..a4db0b895f 100644 --- a/gtk/graph_analysis.c +++ b/gtk/graph_analysis.c @@ -53,7 +53,6 @@ #include "file_dlg.h" #include "gui_utils.h" #include "main.h" -#include "compat_macros.h" #include "../color.h" #include "epan/filesystem.h" #include "file_util.h" diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c index ed6413c0c2..23cd5e5c1b 100644 --- a/gtk/gsm_a_stat.c +++ b/gtk/gsm_a_stat.c @@ -53,7 +53,6 @@ #include <epan/dissectors/packet-gsm_a.h> #include "../globals.h" #include "filter_dlg.h" -#include "compat_macros.h" #include "gui_utils.h" diff --git a/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c index 83d2ad3d5c..c2a2f43ae9 100644 --- a/gtk/gsm_map_stat.c +++ b/gtk/gsm_map_stat.c @@ -52,7 +52,6 @@ #include "../register.h" #include "../globals.h" #include "filter_dlg.h" -#include "compat_macros.h" #include <epan/asn1.h> #include <epan/dissectors/packet-gsm_map.h> diff --git a/gtk/gsm_map_summary.c b/gtk/gsm_map_summary.c index c81bbcc41e..e46627e207 100644 --- a/gtk/gsm_map_summary.c +++ b/gtk/gsm_map_summary.c @@ -49,7 +49,6 @@ #include "summary.h" #include "dlg_utils.h" #include "gui_utils.h" -#include "compat_macros.h" #include <epan/tap.h> #include <epan/asn1.h> diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c index 2c4f097600..7396583502 100644 --- a/gtk/gui_prefs.c +++ b/gtk/gui_prefs.c @@ -42,7 +42,6 @@ #include "dlg_utils.h" #include "proto_draw.h" #include "main.h" -#include "compat_macros.h" #include "font_utils.h" #include "packet_list.h" #include "toolbar.h" diff --git a/gtk/gui_stat_util.c b/gtk/gui_stat_util.c index 6ace971bff..4ff97ae17e 100644 --- a/gtk/gui_stat_util.c +++ b/gtk/gui_stat_util.c @@ -36,7 +36,6 @@ #include <gtk/gtk.h> #include <string.h> #include "gui_stat_util.h" -#include "compat_macros.h" #include "../simple_dialog.h" #include "../file.h" #include "../globals.h" diff --git a/gtk/gui_utils.c b/gtk/gui_utils.c index 006818e2c2..0c669c231d 100644 --- a/gtk/gui_utils.c +++ b/gtk/gui_utils.c @@ -39,7 +39,6 @@ #include <epan/prefs.h> #include "epan/epan.h" #include "../ui_util.h" -#include "compat_macros.h" #include "recent.h" #ifdef _WIN32 diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c index 91cfe19b4b..2b27e6ea8b 100644 --- a/gtk/h225_counter.c +++ b/gtk/h225_counter.c @@ -44,7 +44,6 @@ #include "../register.h" #include <epan/dissectors/packet-h225.h> #include "gui_stat_util.h" -#include "compat_macros.h" #include "../simple_dialog.h" #include "dlg_utils.h" #include "../file.h" diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c index b5d898a4dd..5b0816ecab 100644 --- a/gtk/h225_ras_srt.c +++ b/gtk/h225_ras_srt.c @@ -45,7 +45,6 @@ #include <epan/dissectors/packet-h225.h> #include "../timestats.h" #include "gui_stat_util.h" -#include "compat_macros.h" #include "../simple_dialog.h" #include "dlg_utils.h" #include "../file.h" diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c index 6a2615d2b1..d92edbcba0 100644 --- a/gtk/help_dlg.c +++ b/gtk/help_dlg.c @@ -38,7 +38,6 @@ #include <epan/prefs.h> #include "gtkglobals.h" #include "gui_utils.h" -#include "compat_macros.h" #include "dlg_utils.h" #include "simple_dialog.h" #include "webbrowser.h" diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c index 91ffdf701b..1ad31905c7 100644 --- a/gtk/hostlist_table.c +++ b/gtk/hostlist_table.c @@ -39,7 +39,6 @@ #include <epan/addr_resolv.h> #include <epan/tap.h> -#include "compat_macros.h" #include "hostlist_table.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" diff --git a/gtk/layout_prefs.c b/gtk/layout_prefs.c index fb9faf2b98..847782dc11 100644 --- a/gtk/layout_prefs.c +++ b/gtk/layout_prefs.c @@ -35,7 +35,6 @@ #include "prefs_dlg.h" #include "gui_utils.h" #include "main.h" -#include "compat_macros.h" #include "dlg_utils.h" #include "../ui_util.h" diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c index f6695950e1..7e973a8336 100644 --- a/gtk/ldap_stat.c +++ b/gtk/ldap_stat.c @@ -42,7 +42,6 @@ #include <epan/dissectors/packet-ldap.h> #include "../register.h" #include "../timestats.h" -#include "compat_macros.h" #include "../simple_dialog.h" #include "gui_utils.h" #include "dlg_utils.h" diff --git a/gtk/mcast_stream_dlg.c b/gtk/mcast_stream_dlg.c index e0c33b13d6..744f82f900 100644 --- a/gtk/mcast_stream_dlg.c +++ b/gtk/mcast_stream_dlg.c @@ -43,7 +43,6 @@ #include "gui_stat_menu.h" #include "dlg_utils.h" #include "gui_utils.h" -#include "compat_macros.h" #include "gtkglobals.h" #include "simple_dialog.h" diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c index af7f33164e..f76a5849f3 100644 --- a/gtk/mgcp_stat.c +++ b/gtk/mgcp_stat.c @@ -44,7 +44,6 @@ #include "../epan/dissectors/packet-mgcp.h" #include "../timestats.h" #include "gui_stat_util.h" -#include "compat_macros.h" #include "../simple_dialog.h" #include "dlg_utils.h" #include "../file.h" diff --git a/gtk/mtp3_stat.c b/gtk/mtp3_stat.c index 0f1295acc0..878c2a252c 100644 --- a/gtk/mtp3_stat.c +++ b/gtk/mtp3_stat.c @@ -52,7 +52,6 @@ #include "../register.h" #include "../globals.h" #include "filter_dlg.h" -#include "compat_macros.h" #include "gui_utils.h" #include <epan/dissectors/packet-mtp3.h> diff --git a/gtk/mtp3_summary.c b/gtk/mtp3_summary.c index 336bbe736c..d123cc68a7 100644 --- a/gtk/mtp3_summary.c +++ b/gtk/mtp3_summary.c @@ -52,7 +52,6 @@ #include "image/clist_descend.xpm" #include "dlg_utils.h" #include "gui_utils.h" -#include "compat_macros.h" #include <epan/tap.h> #include <epan/dissectors/packet-mtp3.h> diff --git a/gtk/nameres_prefs.c b/gtk/nameres_prefs.c index c6fa3be56e..ab30e5e1ac 100644 --- a/gtk/nameres_prefs.c +++ b/gtk/nameres_prefs.c @@ -38,7 +38,6 @@ #include "gui_utils.h" #include "main.h" #include "menu.h" -#include "compat_macros.h" #define M_RESOLVE_KEY "m_resolve" #define N_RESOLVE_KEY "n_resolve" diff --git a/gtk/ncp_stat.c b/gtk/ncp_stat.c index cc75fa1bb3..cf2d974f18 100644 --- a/gtk/ncp_stat.c +++ b/gtk/ncp_stat.c @@ -42,7 +42,6 @@ #include <epan/dissectors/packet-ncp-int.h> #include "../register.h" #include "../timestats.h" -#include "compat_macros.h" #include "../simple_dialog.h" #include "gui_utils.h" #include "dlg_utils.h" diff --git a/gtk/packet_list.c b/gtk/packet_list.c index 8d0e2ffab6..1198ad71d2 100644 --- a/gtk/packet_list.c +++ b/gtk/packet_list.c @@ -41,7 +41,6 @@ #include "colors.h" #include <epan/column.h> #include "epan/column_info.h" -#include "compat_macros.h" #include <epan/prefs.h> #include "capture_file_dlg.h" #include "packet_list.h" diff --git a/gtk/packet_win.c b/gtk/packet_win.c index ef4fcdba7c..2e840d1c98 100644 --- a/gtk/packet_win.c +++ b/gtk/packet_win.c @@ -63,7 +63,6 @@ #include "gui_utils.h" #include <epan/plugins.h> #include <epan/epan_dissect.h> -#include "compat_macros.h" #include <epan/strutil.h> #include "../ui_util.h" diff --git a/gtk/pixmap_save.c b/gtk/pixmap_save.c index 08a0ff532d..322675249d 100644 --- a/gtk/pixmap_save.c +++ b/gtk/pixmap_save.c @@ -37,7 +37,6 @@ #include "simple_dialog.h" #include "gui_utils.h" #include "file_dlg.h" -#include "compat_macros.h" #include <errno.h> #include <epan/filesystem.h> diff --git a/gtk/plugins_dlg.c b/gtk/plugins_dlg.c index 680367c883..bd3f775af0 100644 --- a/gtk/plugins_dlg.c +++ b/gtk/plugins_dlg.c @@ -32,7 +32,6 @@ #include <epan/plugins.h> #include "dlg_utils.h" #include "gui_utils.h" -#include "compat_macros.h" #include "plugins_dlg.h" #ifdef HAVE_PLUGINS diff --git a/gtk/profile_dlg.c b/gtk/profile_dlg.c index 0acdb1f444..2f58819cd6 100644 --- a/gtk/profile_dlg.c +++ b/gtk/profile_dlg.c @@ -40,7 +40,6 @@ #include "dlg_utils.h" #include "gui_utils.h" #include "simple_dialog.h" -#include "compat_macros.h" #include "gtkglobals.h" #include "help_dlg.h" #include <epan/prefs.h> diff --git a/gtk/progress_dlg.c b/gtk/progress_dlg.c index 2182c51c42..fedd4690cb 100644 --- a/gtk/progress_dlg.c +++ b/gtk/progress_dlg.c @@ -33,7 +33,6 @@ #include "dlg_utils.h" #include "gui_utils.h" #include "progress_dlg.h" -#include "compat_macros.h" #define PROG_BAR_KEY "progress_bar" diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c index 6db0e8cb38..41a1f852e3 100644 --- a/gtk/proto_dlg.c +++ b/gtk/proto_dlg.c @@ -39,7 +39,6 @@ #include "dlg_utils.h" #include "proto_dlg.h" #include "simple_dialog.h" -#include "compat_macros.h" #include "disabled_protos.h" #include <epan/filesystem.h> #include "help_dlg.h" diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c index 60891866f5..0fff1c6d50 100644 --- a/gtk/proto_draw.c +++ b/gtk/proto_draw.c @@ -65,7 +65,6 @@ #include "file_dlg.h" #include "gui_utils.h" #include "gtkglobals.h" -#include "compat_macros.h" #include "alert_box.h" #include "simple_dialog.h" #include "progress_dlg.h" diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c index 057b155ca6..fc27159ba1 100644 --- a/gtk/proto_hier_stats_dlg.c +++ b/gtk/proto_hier_stats_dlg.c @@ -32,14 +32,12 @@ #include "proto_hier_stats.h" #include "proto_hier_stats_dlg.h" -#include "compat_macros.h" #include "dlg_utils.h" #include "gui_utils.h" #include "find_dlg.h" #include "color_dlg.h" #include "gtkglobals.h" #include "main.h" -#include "compat_macros.h" #include "simple_dialog.h" #include "help_dlg.h" diff --git a/gtk/radius_stat.c b/gtk/radius_stat.c index 257745ab0b..9dc8e189ee 100644 --- a/gtk/radius_stat.c +++ b/gtk/radius_stat.c @@ -44,7 +44,6 @@ #include <epan/dissectors/packet-radius.h> #include "../timestats.h" #include "gui_stat_util.h" -#include "compat_macros.h" #include "../simple_dialog.h" #include "dlg_utils.h" #include "../file.h" diff --git a/gtk/range_utils.c b/gtk/range_utils.c index 1d10d8e25c..39a28d76d0 100644 --- a/gtk/range_utils.c +++ b/gtk/range_utils.c @@ -35,7 +35,6 @@ #include "packet-range.h" #include "gui_utils.h" #include "dlg_utils.h" -#include "compat_macros.h" #include "simple_dialog.h" #include "range_utils.h" diff --git a/gtk/rpc_progs.c b/gtk/rpc_progs.c index 5ca868188a..87aedd466b 100644 --- a/gtk/rpc_progs.c +++ b/gtk/rpc_progs.c @@ -46,7 +46,6 @@ #include "../globals.h" #include "gui_utils.h" #include "dlg_utils.h" -#include "compat_macros.h" static GtkWidget *win=NULL; static GtkWidget *table=NULL; diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index 82542f76b7..fe2ed1ba03 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -70,7 +70,6 @@ #include "gui_stat_menu.h" #include "main.h" #include "progress_dlg.h" -#include "compat_macros.h" #include "../color.h" #include "image/clist_ascend.xpm" diff --git a/gtk/rtp_player.c b/gtk/rtp_player.c index 30eb1ee932..83c581e131 100644 --- a/gtk/rtp_player.c +++ b/gtk/rtp_player.c @@ -68,7 +68,6 @@ #include "simple_dialog.h" #include "gui_utils.h" #include "dlg_utils.h" -#include "compat_macros.h" #include "graph_analysis.h" #include "voip_calls_dlg.h" diff --git a/gtk/rtp_player_prefs.c b/gtk/rtp_player_prefs.c index 2854af78fa..d66137ddcd 100644 --- a/gtk/rtp_player_prefs.c +++ b/gtk/rtp_player_prefs.c @@ -31,7 +31,6 @@ #include "rtp_player_prefs.h" #include <epan/prefs.h> #include "prefs_dlg.h" -#include "compat_macros.h" #define RTP_PLAYER_MAX_VISIBLE_KEY "max_visible" #define RTP_PLAYER_TABLE_ROWS 6 diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c index 330d02d030..8c74152145 100644 --- a/gtk/rtp_stream_dlg.c +++ b/gtk/rtp_stream_dlg.c @@ -39,7 +39,6 @@ #include "dlg_utils.h" #include "file_dlg.h" #include "gui_utils.h" -#include "compat_macros.h" #include "gtkglobals.h" #include "image/clist_ascend.xpm" diff --git a/gtk/sctp_assoc_analyse.c b/gtk/sctp_assoc_analyse.c index 20779cf6af..12c8ea7241 100644 --- a/gtk/sctp_assoc_analyse.c +++ b/gtk/sctp_assoc_analyse.c @@ -38,7 +38,6 @@ #include "dlg_utils.h" #include "gui_utils.h" #include "main.h" -#include "compat_macros.h" #include <epan/strutil.h> #include "sctp_stat.h" diff --git a/gtk/sctp_byte_graph_dlg.c b/gtk/sctp_byte_graph_dlg.c index da81208ce1..9f685640bf 100644 --- a/gtk/sctp_byte_graph_dlg.c +++ b/gtk/sctp_byte_graph_dlg.c @@ -38,7 +38,6 @@ #include "dlg_utils.h" #include "ui_util.h" #include "main.h" -#include "compat_macros.h" #include "simple_dialog.h" #include "sctp_stat.h" #include <epan/strutil.h> diff --git a/gtk/sctp_chunk_stat.c b/gtk/sctp_chunk_stat.c index 6a89cdf01a..5665876647 100644 --- a/gtk/sctp_chunk_stat.c +++ b/gtk/sctp_chunk_stat.c @@ -44,7 +44,6 @@ #include "../register.h" #include <epan/dissectors/packet-sctp.h> #include "gui_stat_util.h" -#include "compat_macros.h" #include "../simple_dialog.h" #include "dlg_utils.h" #include "../file.h" diff --git a/gtk/sctp_chunk_stat_dlg.c b/gtk/sctp_chunk_stat_dlg.c index 5e21ba454d..e11c849c18 100644 --- a/gtk/sctp_chunk_stat_dlg.c +++ b/gtk/sctp_chunk_stat_dlg.c @@ -38,7 +38,6 @@ #include "dlg_utils.h" #include "gui_utils.h" #include "main.h" -#include "compat_macros.h" #include "sctp_stat.h" diff --git a/gtk/sctp_error_dlg.c b/gtk/sctp_error_dlg.c index 3b4838dfd8..b2c60c1b4c 100644 --- a/gtk/sctp_error_dlg.c +++ b/gtk/sctp_error_dlg.c @@ -34,7 +34,6 @@ #include "dlg_utils.h" #include "gui_utils.h" #include "main.h" -#include "compat_macros.h" #include "sctp_stat.h" /*#include "sctp_assoc_analyse.h"*/ diff --git a/gtk/sctp_graph_dlg.c b/gtk/sctp_graph_dlg.c index eec43798e1..eaa74ebb7b 100644 --- a/gtk/sctp_graph_dlg.c +++ b/gtk/sctp_graph_dlg.c @@ -39,7 +39,6 @@ #include "dlg_utils.h" #include "ui_util.h" #include "main.h" -#include "compat_macros.h" #include "simple_dialog.h" #include "sctp_stat.h" #include <epan/strutil.h> diff --git a/gtk/sctp_stat.c b/gtk/sctp_stat.c index dc64adce1d..0134277e1a 100644 --- a/gtk/sctp_stat.c +++ b/gtk/sctp_stat.c @@ -33,7 +33,6 @@ #include "epan/packet_info.h" /* Needed for packet_info */ #include <epan/tap.h> /* Needed for register_tap_listener */ #include "dlg_utils.h" -#include "compat_macros.h" #include "register.h" #include <string.h> #include "sctp_stat.h" diff --git a/gtk/sctp_stat_dlg.c b/gtk/sctp_stat_dlg.c index a3476a349b..c1e8d55896 100644 --- a/gtk/sctp_stat_dlg.c +++ b/gtk/sctp_stat_dlg.c @@ -40,7 +40,6 @@ #include "dlg_utils.h" #include "gui_utils.h" #include "main.h" -#include "compat_macros.h" #include "sctp_stat.h" #include "gtkglobals.h" diff --git a/gtk/service_response_time_table.c b/gtk/service_response_time_table.c index 87ec08df6b..b5c8559c0e 100644 --- a/gtk/service_response_time_table.c +++ b/gtk/service_response_time_table.c @@ -33,7 +33,6 @@ #include <stdio.h> #include <math.h> #include <gtk/gtk.h> -#include "compat_macros.h" #include "epan/packet_info.h" #include "service_response_time_table.h" #include "image/clist_ascend.xpm" diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c index c6cb28f655..dd7b92ea84 100644 --- a/gtk/sip_stat.c +++ b/gtk/sip_stat.c @@ -41,7 +41,6 @@ #include "../register.h" #include <epan/dissectors/packet-sip.h> #include "../globals.h" -#include "compat_macros.h" #include "../stat_menu.h" #include "../tap_dfilter_dlg.h" diff --git a/gtk/smb2_stat.c b/gtk/smb2_stat.c index f0c11a2d2f..6d8857bdcb 100644 --- a/gtk/smb2_stat.c +++ b/gtk/smb2_stat.c @@ -42,7 +42,6 @@ #include <epan/dissectors/packet-smb2.h> #include "../register.h" #include "../timestats.h" -#include "compat_macros.h" #include "../simple_dialog.h" #include "gui_utils.h" #include "dlg_utils.h" diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c index c57ec36e11..2ddee5cc50 100644 --- a/gtk/smb_stat.c +++ b/gtk/smb_stat.c @@ -43,7 +43,6 @@ #include <epan/dissectors/packet-smb.h> #include "../register.h" #include "../timestats.h" -#include "compat_macros.h" #include "../simple_dialog.h" #include "gui_utils.h" #include "dlg_utils.h" diff --git a/gtk/stats_tree_stat.c b/gtk/stats_tree_stat.c index a6084e946a..7ed728f993 100644 --- a/gtk/stats_tree_stat.c +++ b/gtk/stats_tree_stat.c @@ -38,7 +38,6 @@ #include "globals.h" #include "gui_utils.h" #include "dlg_utils.h" -#include "compat_macros.h" #include "../stat_menu.h" #include "../tap_dfilter_dlg.h" diff --git a/gtk/stream_prefs.c b/gtk/stream_prefs.c index 198e569075..584d2e28ab 100644 --- a/gtk/stream_prefs.c +++ b/gtk/stream_prefs.c @@ -35,7 +35,6 @@ #include "keys.h" #include "print.h" #include <epan/prefs.h> -#include "compat_macros.h" #include "follow_tcp.h" #include "packet_list.h" diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c index a9dfdc9d42..310322f3d6 100644 --- a/gtk/summary_dlg.c +++ b/gtk/summary_dlg.c @@ -47,7 +47,6 @@ #include "summary_dlg.h" #include "dlg_utils.h" #include "gui_utils.h" -#include "compat_macros.h" #include "help_dlg.h" #include <epan/strutil.h> diff --git a/gtk/supported_protos_dlg.c b/gtk/supported_protos_dlg.c index d288de013c..177ab60999 100644 --- a/gtk/supported_protos_dlg.c +++ b/gtk/supported_protos_dlg.c @@ -35,7 +35,6 @@ #include "globals.h" #include "gtkglobals.h" #include "gui_utils.h" -#include "compat_macros.h" #include "dlg_utils.h" #include "font_utils.h" diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index da0fa6fb73..b1aec6f263 100644 --- a/gtk/tcp_graph.c +++ b/gtk/tcp_graph.c @@ -40,7 +40,6 @@ #include "simple_dialog.h" #include "gui_utils.h" #include "color.h" -#include "compat_macros.h" #include <epan/etypes.h> #include <epan/ppptypes.h> #include "dlg_utils.h" diff --git a/gtk/text_page.c b/gtk/text_page.c index 772e2095b1..7fd66e8d7b 100644 --- a/gtk/text_page.c +++ b/gtk/text_page.c @@ -35,7 +35,6 @@ #include "epan/filesystem.h" #include "text_page.h" #include "gui_utils.h" -#include "compat_macros.h" #include "simple_dialog.h" #include "font_utils.h" #include "file_util.h" diff --git a/gtk/toolbar.c b/gtk/toolbar.c index 6e8cd36832..a818330ac1 100644 --- a/gtk/toolbar.c +++ b/gtk/toolbar.c @@ -49,7 +49,6 @@ #include "gtkglobals.h" #include "stock_icons.h" #include "keys.h" -#include "compat_macros.h" #include "recent.h" #include "packet_history.h" #include "packet_list.h" diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c index 5fb16122be..a04690377e 100644 --- a/gtk/voip_calls_dlg.c +++ b/gtk/voip_calls_dlg.c @@ -55,7 +55,6 @@ #include "gui_stat_menu.h" #include "dlg_utils.h" #include "gui_utils.h" -#include "compat_macros.h" #include "gtkglobals.h" #include "image/clist_ascend.xpm" diff --git a/gtk/webbrowser.c b/gtk/webbrowser.c index 0aa6e0c974..365b58c382 100644 --- a/gtk/webbrowser.c +++ b/gtk/webbrowser.c @@ -38,7 +38,6 @@ #include <epan/prefs.h> #include "webbrowser.h" -#include "compat_macros.h" #include "simple_dialog.h" /* diff --git a/gtk/wlan_stat_dlg.c b/gtk/wlan_stat_dlg.c index f18d91ec6a..aa0f36d0ef 100644 --- a/gtk/wlan_stat_dlg.c +++ b/gtk/wlan_stat_dlg.c @@ -38,7 +38,6 @@ #include <epan/addr_resolv.h> #include <epan/tap.h> #include "../register.h" -#include "compat_macros.h" #include "../simple_dialog.h" #include "dlg_utils.h" #include "../globals.h" diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c index 0b3f2e0909..2a3ef53ee3 100644 --- a/gtk/wsp_stat.c +++ b/gtk/wsp_stat.c @@ -40,7 +40,6 @@ #include <epan/tap.h> #include "../register.h" #include "../globals.h" -#include "compat_macros.h" #include <epan/dissectors/packet-wsp.h> #include "../stat_menu.h" #include "../tap_dfilter_dlg.h" |