Don't define a static variable (the_tapinfo_struct) in a header file; instead declare...

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

diff --git a/gtk/rtp_stream.c b/gtk/rtp_stream.c
index efca6b83fc145e6de15f04e49ab613296ddd2a60..29770fb18eee6662541afe3bec464771d9cb9f74 100644 (file)
--- a/gtk/rtp_stream.c
+++ b/gtk/rtp_stream.c
@@ -56,6 +56,11 @@
 #include "gtk/rtp_stream_dlg.h"
 #include "gtk/main.h"
 
+/* The one and only global rtpstream_tapinfo_t structure for tshark and wireshark.
+ */ 
+static rtpstream_tapinfo_t the_tapinfo_struct = 
+        {0, NULL, 0, TAP_ANALYSE, NULL, NULL, NULL, 0, FALSE}; 
+
 
 /****************************************************************************/
 /* redraw the output */

diff --git a/tap-rtp-common.h b/tap-rtp-common.h
index b7b07a8bfee160a9de028576657e14c780ad3e0f..3ad22e268930b96b8e1266b021f17402e14da9f4 100644 (file)
--- a/tap-rtp-common.h
+++ b/tap-rtp-common.h
@@ -40,10 +40,4 @@ void rtp_write_header(rtp_stream_info_t*, FILE*);
 void rtp_write_sample(rtp_sample_t*, FILE*);
 int rtpstream_packet(void*, packet_info*, epan_dissect_t *, const void *);
 
-/* The one and only global rtpstream_tapinfo_t structure for tshark and wireshark.
- */ 
-static rtpstream_tapinfo_t the_tapinfo_struct = 
-        {0, NULL, 0, TAP_ANALYSE, NULL, NULL, NULL, 0, FALSE}; 
-
-
 #endif /*TAP_RTP_COMMON_H_INCLUDED*/

diff --git a/tap-rtp.c b/tap-rtp.c
index 72010ac1d13bf4e6660e87209f787a79709e7033..6823d4198e32cab3343572e7583fc0f6c331d920 100644 (file)
--- a/tap-rtp.c
+++ b/tap-rtp.c
@@ -54,7 +54,10 @@
 #include "register.h"
 #include "tap-rtp-common.h"
 
-
+/* The one and only global rtpstream_tapinfo_t structure for tshark and wireshark.
+ */ 
+static rtpstream_tapinfo_t the_tapinfo_struct = 
+        {0, NULL, 0, TAP_ANALYSE, NULL, NULL, NULL, 0, FALSE}; 
 
 static void
 rtp_streams_stat_draw(void *arg _U_)