move ipsec to DISSECTOR_SRC

fix some more MacOSX gcc warnings

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21433 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 6a4ca178376bfdc3ccf810a932ce728605c7188f..9084fe8b7a1ee5af6aa48929393ecc815d1412f4 100644 (file)
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -439,7 +439,6 @@ CLEAN_DISSECTOR_SRC = \
        packet-ipp.c            \
        packet-ipsec-tcp.c      \
        packet-ipsec-udp.c      \
-       packet-ipsec.c          \
        packet-ipv6.c           \
        packet-ipvs-syncd.c     \
        packet-ipx.c            \
@@ -741,6 +740,7 @@ DISSECTOR_SRC =     \
        packet-ber.c            \
        packet-cops.c           \
        packet-diameter.c       \
+       packet-ipsec.c          \
        packet-isup.c           \
        packet-k12.c            \
        packet-nbd.c            \

diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c
index 69a70a97756faecedceffc3c270fcb9192aa064b..a95b255fd1fb682feeffcbc8936abeb9b9cad854 100644 (file)
--- a/gtk/gui_prefs.c
+++ b/gtk/gui_prefs.c
@@ -72,7 +72,7 @@ static gint recent_files_count_changed_cb(GtkWidget *recent_files_entry _U_,
 #define GUI_FIND_WRAP_KEY       "find_wrap"
 #define GUI_USE_PREF_SAVE_KEY   "use_pref_save"
 
-static const enum_val_t scrollbar_placement_vals[] = {
+static const enum_val_t scrollbar_placement_vals[] _U_ = {
        { "FALSE", "Left", FALSE },
        { "TRUE",  "Right", TRUE },
        { NULL,    NULL,    0 }
@@ -101,27 +101,27 @@ static const enum_val_t expander_style_vals[] = {
        { NULL,       NULL,       0 }
 };
 #else
-static const enum_val_t altern_colors_vals[] = {
+static const enum_val_t altern_colors_vals[] _U_ = {
        { "FALSE", "No",  FALSE },
        { "TRUE",  "Yes", TRUE },
        { NULL,    NULL,  0 }
 };
 #endif
 
-static const enum_val_t filter_toolbar_placement_vals[] = {
+static const enum_val_t filter_toolbar_placement_vals[] _U_ = {
        { "FALSE", "Below the main toolbar", FALSE },
        { "TRUE",  "Insert into statusbar",  TRUE },
        { NULL,    NULL,                     0 }
 };
 
-static const enum_val_t highlight_style_vals[] = {
+static const enum_val_t highlight_style_vals[] _U_ = {
        { "FALSE", "Bold",     FALSE },
        { "TRUE",  "Inverse",  TRUE },
        { NULL,    NULL,       0 }
 };
 
 
-static const enum_val_t toolbar_style_vals[] = {
+static const enum_val_t toolbar_style_vals[] _U_ = {
        { "ICONS", "Icons only",     TB_STYLE_ICONS },
        { "TEXT",  "Text only",      TB_STYLE_TEXT },
        { "BOTH",  "Icons & Text",   TB_STYLE_BOTH },

diff --git a/plugins/docsis/packet-type29ucd.c b/plugins/docsis/packet-type29ucd.c
index 041e32fe87150ea18696646a114cac3c22116b01..81ff2de83f5c3ebd147dff8cbf57a713215e0f90 100644 (file)
--- a/plugins/docsis/packet-type29ucd.c
+++ b/plugins/docsis/packet-type29ucd.c
@@ -136,7 +136,7 @@ static int hf_docsis_tcm_enabled = -1;
 static gint ett_docsis_type29ucd = -1;
 static gint ett_burst_descr = -1;
 
-static const value_string channel_tlv_vals[] = {
+static const value_string channel_tlv_vals[] _U_ = {
      {type29ucd_SYMBOL_RATE, "Symbol Rate"},
      {type29ucd_FREQUENCY, "Frequency"},
      {type29ucd_PREAMBLE, "Preamble Pattern"},

diff --git a/plugins/h223/packet-h223.c b/plugins/h223/packet-h223.c
index 4a20a7b1d02e08ccd38ff7d061c7a6c094d7a6cf..4bd575f7c24f9083dd719e275abf53e54dcf0780 100644 (file)
--- a/plugins/h223/packet-h223.c
+++ b/plugins/h223/packet-h223.c
@@ -125,7 +125,7 @@ static dissector_handle_t data_handle=NULL;
 static dissector_handle_t srp_handle=NULL;
 static dissector_handle_t h245dg_handle=NULL;
 
-static const fragment_items h223_mux_frag_items = {
+static const fragment_items h223_mux_frag_items _U_ = {
        &ett_h223_mux_fragment,
        &ett_h223_mux_fragments,
        &hf_h223_mux_fragments,