aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2006-11-22 20:52:40 +0000
committerUlf Lamping <ulf.lamping@web.de>2006-11-22 20:52:40 +0000
commitff31e49dbc45201327dfa088eef2f91ac369179a (patch)
tree457392d1a4dce39bb284ed1d3c4459d6811192fe
parent651ed769250ed832e64a6dbb3cdc56da1579a856 (diff)
fix Win32 build: scsi_ssc2_vals -> scsi_ssc_vals
svn path=/trunk/; revision=19958
-rw-r--r--epan/dissectors/packet-scsi-ssc.h2
-rw-r--r--epan/dissectors/packet-scsi.h1
-rw-r--r--epan/libwireshark.def2
3 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-scsi-ssc.h b/epan/dissectors/packet-scsi-ssc.h
index 5aef5800d3..4c4fd80dd2 100644
--- a/epan/dissectors/packet-scsi-ssc.h
+++ b/epan/dissectors/packet-scsi-ssc.h
@@ -57,6 +57,6 @@
extern int hf_scsi_ssc_opcode;
extern scsi_cdb_table_t scsi_ssc_table[256];
-extern const value_string scsi_ssc_vals[];
+WS_VAR_IMPORT const value_string scsi_ssc_vals[];
#endif
diff --git a/epan/dissectors/packet-scsi.h b/epan/dissectors/packet-scsi.h
index 0a10dfbb8c..844604980d 100644
--- a/epan/dissectors/packet-scsi.h
+++ b/epan/dissectors/packet-scsi.h
@@ -228,7 +228,6 @@ void dissect_scsi_snsinfo (tvbuff_t *, packet_info *, proto_tree *, guint, guint
WS_VAR_IMPORT const value_string scsi_sbc2_vals[];
WS_VAR_IMPORT const value_string scsi_mmc_vals[];
-WS_VAR_IMPORT const value_string scsi_ssc2_vals[];
extern int hf_scsi_control;
extern int hf_scsi_alloclen16;
diff --git a/epan/libwireshark.def b/epan/libwireshark.def
index e2366f1809..8723eeb839 100644
--- a/epan/libwireshark.def
+++ b/epan/libwireshark.def
@@ -650,7 +650,7 @@ rtp_payload_type_vals DATA
rtp_payload_type_short_vals DATA
scsi_mmc_vals DATA
scsi_sbc2_vals DATA
-scsi_ssc2_vals DATA
+scsi_ssc_vals DATA
set_actual_length
show_fragment_seq_tree
show_fragment_tree