From 440a1809ccc043ade2b85d6e24d8e45744965faf Mon Sep 17 00:00:00 2001
From: Anders Broman <anders.broman@ericsson.com>
Date: Tue, 10 Dec 2013 21:30:13 +0000
Subject: - Forward declaration of register functions.

svn path=/trunk/; revision=53918
---
 epan/dissectors/packet-smpp.c          |  2 ++
 epan/dissectors/packet-smtp.c          |  3 +++
 epan/dissectors/packet-sna.c           |  2 ++
 epan/dissectors/packet-snaeth.c        |  2 ++
 epan/dissectors/packet-sndcp-xid.c     |  3 +++
 epan/dissectors/packet-sndcp.c         |  3 +++
 epan/dissectors/packet-socketcan.c     |  2 ++
 epan/dissectors/packet-socks.c         |  3 +++
 epan/dissectors/packet-spice.c         | 11 +++++++----
 epan/dissectors/packet-spice.h         |  4 ++--
 epan/dissectors/packet-spp.c           |  3 +++
 epan/dissectors/packet-spray.c         |  3 +++
 epan/dissectors/packet-sprt.c          |  2 ++
 epan/dissectors/packet-srp.c           |  4 ++++
 epan/dissectors/packet-srvloc.c        |  3 +++
 epan/dissectors/packet-sscf-nni.c      |  3 +++
 epan/dissectors/packet-sscop.c         |  3 +++
 epan/dissectors/packet-ssh.c           |  3 +++
 epan/dissectors/packet-starteam.c      |  3 +++
 epan/dissectors/packet-stat-notify.c   |  3 +++
 epan/dissectors/packet-stat.c          |  3 +++
 epan/dissectors/packet-stun.c          |  3 +++
 epan/dissectors/packet-sua.c           |  3 +++
 epan/dissectors/packet-symantec.c      |  3 +++
 epan/dissectors/packet-sync.c          |  3 +++
 epan/dissectors/packet-synergy.c       |  2 +-
 epan/dissectors/packet-synphasor.c     |  1 +
 epan/dissectors/packet-syslog.c        |  3 +++
 epan/dissectors/packet-t30.c           |  2 ++
 epan/dissectors/packet-tacacs.c        |  6 ++++++
 epan/dissectors/packet-tali.c          |  3 +++
 epan/dissectors/packet-tapa.c          |  3 +++
 epan/dissectors/packet-tdmoe.c         |  3 +++
 epan/dissectors/packet-tds.c           |  3 +++
 epan/dissectors/packet-teamspeak2.c    |  2 ++
 epan/dissectors/packet-teimanagement.c |  3 +++
 epan/dissectors/packet-teklink.c       |  3 +++
 epan/dissectors/packet-telkonet.c      |  3 +++
 epan/dissectors/packet-telnet.c        |  3 +++
 epan/dissectors/packet-teredo.c        |  3 +++
 epan/dissectors/packet-text-media.c    |  2 ++
 epan/dissectors/packet-tfp.c           |  3 +++
 epan/dissectors/packet-tftp.c          |  2 ++
 epan/dissectors/packet-time.c          |  2 ++
 epan/dissectors/packet-tipc.c          |  2 ++
 epan/dissectors/packet-tivoconnect.c   |  1 +
 epan/dissectors/packet-tnef.c          |  3 +++
 epan/dissectors/packet-tns.c           |  2 ++
 epan/dissectors/packet-tpkt.c          |  3 +++
 epan/dissectors/packet-tpncp.c         |  3 +++
 epan/dissectors/packet-tr.c            |  3 +++
 epan/dissectors/packet-trill.c         |  3 +++
 epan/dissectors/packet-tsp.c           |  2 ++
 epan/dissectors/packet-tte-pcf.c       |  3 +++
 epan/dissectors/packet-tte.c           |  3 +++
 epan/dissectors/packet-turbocell.c     |  3 +++
 epan/dissectors/packet-turnchannel.c   |  3 +++
 epan/dissectors/packet-tuxedo.c        |  3 +++
 58 files changed, 162 insertions(+), 7 deletions(-)

(limited to 'epan/dissectors')

diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c
index df1ea08822..0efe2ee9e1 100644
--- a/epan/dissectors/packet-smpp.c
+++ b/epan/dissectors/packet-smpp.c
@@ -84,6 +84,8 @@
 #define SMPP_MIN_LENGTH 16
 
 /* Forward declarations         */
+void proto_register_smpp(void);
+void proto_reg_handoff_smpp(void)
 static int dissect_smpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data);
 static guint get_smpp_pdu_len(packet_info *pinfo, tvbuff_t *tvb, int offset);
 static int dissect_smpp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_);
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c
index 8c581cf5c1..bdcb4b8070 100644
--- a/epan/dissectors/packet-smtp.c
+++ b/epan/dissectors/packet-smtp.c
@@ -50,6 +50,9 @@
 /* RFC 4409 */
 #define TCP_PORT_SUBMISSION 587
 
+void proto_register_smtp(void);
+void proto_reg_handoff_smtp(void);
+
 static int proto_smtp = -1;
 
 static int hf_smtp_req = -1;
diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c
index 9c70866f6b..e3b81f60e2 100644
--- a/epan/dissectors/packet-sna.c
+++ b/epan/dissectors/packet-sna.c
@@ -40,6 +40,8 @@
  * ftp://ftp.software.ibm.com/networking/pub/standards/aiw/formats/
  *
  */
+void proto_register_sna(void);
+void proto_reg_handoff_sna(void);
 
 static int proto_sna = -1;
 static int proto_sna_xid = -1;
diff --git a/epan/dissectors/packet-snaeth.c b/epan/dissectors/packet-snaeth.c
index c3d0e0cf78..0e64e1e581 100644
--- a/epan/dissectors/packet-snaeth.c
+++ b/epan/dissectors/packet-snaeth.c
@@ -33,6 +33,8 @@
  *
  * http://www.cisco.com/univercd/cc/td/doc/product/software/ssr90/rpc_r/18059.pdf
  */
+void proto_register_snaeth(void);
+void proto_reg_handoff_snaeth(void);
 
 static int proto_snaeth = -1;
 static int hf_snaeth_len = -1;
diff --git a/epan/dissectors/packet-sndcp-xid.c b/epan/dissectors/packet-sndcp-xid.c
index 89db6541ff..4d6fd43c08 100644
--- a/epan/dissectors/packet-sndcp-xid.c
+++ b/epan/dissectors/packet-sndcp-xid.c
@@ -45,6 +45,9 @@
 #define ALGO_RFC2507 1
 #define ALGO_ROHC 2
 
+void proto_register_sndcp_xid(void);
+void proto_reg_handoff_sndcp_xid(void);
+
 static const value_string sndcp_xid_dcomp_algo_str[] = {
 	{0x0, "V.42 bis"},
 	{0x1, "V.44"},
diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c
index 55ed2c36bf..3ccbc25d5a 100644
--- a/epan/dissectors/packet-sndcp.c
+++ b/epan/dissectors/packet-sndcp.c
@@ -37,6 +37,9 @@
 #define MASK_T      0x20
 #define MASK_M      0x10
 
+void proto_register_sndcp(void);
+void proto_reg_handoff_sndcp(void);
+
 /* Initialize the protocol and registered fields
 */
 static int proto_sndcp       = -1;
diff --git a/epan/dissectors/packet-socketcan.c b/epan/dissectors/packet-socketcan.c
index 941202b096..94153768cd 100644
--- a/epan/dissectors/packet-socketcan.c
+++ b/epan/dissectors/packet-socketcan.c
@@ -46,6 +46,8 @@
 #define CAN_ERR_FLAG 0x20000000U /* error frame */
 #define CAN_EFF_MASK 0x1FFFFFFFU /* extended frame format (EFF) */
 
+void proto_register_socketcan(void);
+void proto_reg_handoff_socketcan(void);
 
 static int hf_can_len = -1;
 static int hf_can_ident = -1;
diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c
index 028a3244b8..fb55a86980 100644
--- a/epan/dissectors/packet-socks.c
+++ b/epan/dissectors/packet-socks.c
@@ -93,6 +93,9 @@
 #define CHAP_AUTHENTICATION         3
 #define AUTHENTICATION_FAILED       0xff
 
+void proto_register_socks(void);
+void proto_reg_handoff_socks(void);
+
 /*********** Header field identifiers *************/
 
 static int proto_socks = -1;
diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c
index a89e40e626..2f878db693 100644
--- a/epan/dissectors/packet-spice.c
+++ b/epan/dissectors/packet-spice.c
@@ -78,6 +78,9 @@ typedef enum {
     SPICE_DATA
 } spice_session_state_e;
 
+void proto_register_spice(void);
+void proto_reg_handoff_spice(void);
+
 static dissector_handle_t spice_handle;
 
 #define SPICE_CHANNEL_NONE      0
@@ -119,7 +122,7 @@ enum
     SPICE_MAIN_CAP_SEMI_SEAMLESS_MIGRATE_MASK = (1 << SPICE_MAIN_CAP_SEMI_SEAMLESS_MIGRATE),
     SPICE_MAIN_CAP_VM_NAME_UUID_MASK = (1 << SPICE_MAIN_CAP_VM_NAME_UUID),
     SPICE_MAIN_CAP_AGENT_CONNECTED_TOKENS_MASK = (1 << SPICE_MAIN_CAP_AGENT_CONNECTED_TOKENS),
-    SPICE_MAIN_CAP_SEAMLESS_MIGRATE_MASK = (1 << SPICE_MAIN_CAP_SEAMLESS_MIGRATE),
+    SPICE_MAIN_CAP_SEAMLESS_MIGRATE_MASK = (1 << SPICE_MAIN_CAP_SEAMLESS_MIGRATE)
 };
 
 enum {
@@ -136,7 +139,7 @@ enum {
     VD_AGENT_FILE_XFER_STATUS,
     VD_AGENT_FILE_XFER_DATA,
     VD_AGENT_CLIENT_DISCONNECTED,
-    VD_AGENT_END_MESSAGE,
+    VD_AGENT_END_MESSAGE
 };
 
 static const value_string agent_message_type_vs[] = {
@@ -186,7 +189,7 @@ enum {
     VD_AGENT_CAP_CLIPBOARD_SELECTION = (1 << 6),
     VD_AGENT_CAP_SPARSE_MONITORS_CONFIG = (1 << 7),
     VD_AGENT_CAP_GUEST_LINEEND_LF = (1 << 8),
-    VD_AGENT_CAP_GUEST_LINEEND_CRLF = (1 << 9),
+    VD_AGENT_CAP_GUEST_LINEEND_CRLF = (1 << 9)
 };
 
 #if 0
@@ -243,7 +246,7 @@ enum {
     SPICE_DISPLAY_CAP_SIZED_STREAM,
     SPICE_DISPLAY_CAP_MONITORS_CONFIG,
     SPICE_DISPLAY_CAP_COMPOSITE,
-    SPICE_DISPLAY_CAP_A8_SURFACE,
+    SPICE_DISPLAY_CAP_A8_SURFACE
 };
 
 enum {
diff --git a/epan/dissectors/packet-spice.h b/epan/dissectors/packet-spice.h
index ed8086411b..6c6e654e66 100644
--- a/epan/dissectors/packet-spice.h
+++ b/epan/dissectors/packet-spice.h
@@ -713,7 +713,7 @@ enum {
     SPICE_MSG_WAIT_FOR_CHANNELS,
     SPICE_MSG_DISCONNECTING,
     SPICE_MSG_NOTIFY,
-    SPICE_MSG_LIST,
+    SPICE_MSG_LIST
 };
 
 static const value_string spice_msg_vs[] =  {
@@ -734,7 +734,7 @@ enum {
     SPICE_MSGC_PONG,
     SPICE_MSGC_MIGRATE_FLUSH_MARK,
     SPICE_MSGC_MIGRATE_DATA,
-    SPICE_MSGC_DISCONNECTING,
+    SPICE_MSGC_DISCONNECTING
 };
 
 static const value_string spice_msgc_vs[] =  {
diff --git a/epan/dissectors/packet-spp.c b/epan/dissectors/packet-spp.c
index 745c7b1425..d35da47538 100644
--- a/epan/dissectors/packet-spp.c
+++ b/epan/dissectors/packet-spp.c
@@ -29,6 +29,9 @@
 #include <epan/packet.h>
 #include "packet-idp.h"
 
+void proto_register_spp(void);
+void proto_reg_handoff_spp(void);
+
 static int proto_spp = -1;
 static int hf_spp_connection_control = -1;
 static int hf_spp_connection_control_sys = -1;
diff --git a/epan/dissectors/packet-spray.c b/epan/dissectors/packet-spray.c
index 0a1bdceec5..bbf2f7a38b 100644
--- a/epan/dissectors/packet-spray.c
+++ b/epan/dissectors/packet-spray.c
@@ -29,6 +29,9 @@
 #include "packet-rpc.h"
 #include "packet-spray.h"
 
+void proto_register_spray(void);
+void proto_reg_handoff_spray(void);
+
 static int proto_spray = -1;
 static int hf_spray_procedure_v1 = -1;
 static int hf_spray_sprayarr = -1;
diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c
index b47ff436c7..16ede8c041 100644
--- a/epan/dissectors/packet-sprt.c
+++ b/epan/dissectors/packet-sprt.c
@@ -45,6 +45,8 @@
 
 #include "packet-sprt.h"
 
+void proto_register_sprt(void);
+void proto_reg_handoff_sprt(void);
 
 /* for some "range_string"s, there's only one value in the range  */
 #define SPRT_VALUE_RANGE(a) a,a
diff --git a/epan/dissectors/packet-srp.c b/epan/dissectors/packet-srp.c
index bb1347358a..6b2d33c223 100644
--- a/epan/dissectors/packet-srp.c
+++ b/epan/dissectors/packet-srp.c
@@ -31,6 +31,10 @@
 #include <epan/stream.h>
 #include <epan/crc16-tvb.h>
 
+void proto_register_srp(void);
+void proto_register_ccsrl(void);
+void proto_reg_handoff_srp(void);
+
 /* Wireshark ID of the protocols */
 static int proto_srp = -1;
 static int proto_ccsrl = -1;
diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c
index f8addd577b..c7012a6e82 100644
--- a/epan/dissectors/packet-srvloc.c
+++ b/epan/dissectors/packet-srvloc.c
@@ -50,6 +50,9 @@
 #include "packet-tcp.h"
 #include <epan/expert.h>
 
+void proto_register_srvloc(void);
+void proto_reg_handoff_srvloc(void);
+
 static gboolean srvloc_desegment = TRUE;
 static int proto_srvloc = -1;
 static int hf_srvloc_version = -1;
diff --git a/epan/dissectors/packet-sscf-nni.c b/epan/dissectors/packet-sscf-nni.c
index 03d4ef7b95..7fc5bf56f2 100644
--- a/epan/dissectors/packet-sscf-nni.c
+++ b/epan/dissectors/packet-sscf-nni.c
@@ -30,6 +30,9 @@
 #include <glib.h>
 #include <epan/packet.h>
 
+void proto_register_sscf(void);
+void proto_reg_handoff_sscf(void);
+
 static int proto_sscf = -1;
 
 static gint ett_sscf = -1;
diff --git a/epan/dissectors/packet-sscop.c b/epan/dissectors/packet-sscop.c
index 66ed9518ef..330008a1a8 100644
--- a/epan/dissectors/packet-sscop.c
+++ b/epan/dissectors/packet-sscop.c
@@ -31,6 +31,9 @@
 #include <prefs.h>
 #include "packet-sscop.h"
 
+void proto_register_sscop(void);
+void proto_reg_handoff_sscop(void);
+
 int proto_sscop = -1;
 
 static int hf_sscop_type = -1;
diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c
index c650721e11..e478825e6d 100644
--- a/epan/dissectors/packet-ssh.c
+++ b/epan/dissectors/packet-ssh.c
@@ -63,6 +63,9 @@
 
 #include "packet-tcp.h"
 
+void proto_register_ssh(void);
+void proto_reg_handoff_ssh(void);
+
 /* SSH Version 1 definition , from openssh ssh1.h */
 #define SSH1_MSG_NONE			0	/* no message */
 #define SSH1_MSG_DISCONNECT		1	/* cause (string) */
diff --git a/epan/dissectors/packet-starteam.c b/epan/dissectors/packet-starteam.c
index a6251bb083..97e9d626ac 100644
--- a/epan/dissectors/packet-starteam.c
+++ b/epan/dissectors/packet-starteam.c
@@ -37,6 +37,9 @@
 #include <epan/prefs.h>
 #include "packet-tcp.h"
 
+void proto_register_starteam(void);
+void proto_reg_handoff_starteam(void);
+
 static int proto_starteam = -1;
 
 static int hf_starteam_mdh_session_tag = -1;
diff --git a/epan/dissectors/packet-stat-notify.c b/epan/dissectors/packet-stat-notify.c
index c1303385c7..8a3d8ccc5d 100644
--- a/epan/dissectors/packet-stat-notify.c
+++ b/epan/dissectors/packet-stat-notify.c
@@ -29,6 +29,9 @@
 #include "packet-rpc.h"
 #include "packet-stat-notify.h"
 
+void proto_register_statnotify(void);
+void proto_reg_handoff_statnotify(void);
+
 static int proto_statnotify = -1;
 static int hf_statnotify_procedure_v1 = -1;
 static int hf_statnotify_name = -1;
diff --git a/epan/dissectors/packet-stat.c b/epan/dissectors/packet-stat.c
index 771f59274a..bdf3cd83f0 100644
--- a/epan/dissectors/packet-stat.c
+++ b/epan/dissectors/packet-stat.c
@@ -34,6 +34,9 @@
 #include "packet-rpc.h"
 #include "packet-stat.h"
 
+void proto_register_stat(void);
+void proto_reg_handoff_stat(void);
+
 static header_field_info *hfi_stat = NULL;
 
 #define STAT_HFI_INIT HFI_INIT(proto_stat)
diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c
index 2341bd4c25..596cc244c5 100644
--- a/epan/dissectors/packet-stun.c
+++ b/epan/dissectors/packet-stun.c
@@ -47,6 +47,9 @@
 #include <packet-tcp.h>
 #include <packet-udp.h>
 
+void proto_register_stun(void);
+void proto_reg_handoff_stun(void);
+
 /* heuristic subdissectors */
 static heur_dissector_list_t heur_subdissector_list;
 
diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c
index 9645d542d8..808f4d9db9 100644
--- a/epan/dissectors/packet-sua.c
+++ b/epan/dissectors/packet-sua.c
@@ -41,6 +41,9 @@
 #include "packet-sccp.h"
 #include <epan/wmem/wmem.h>
 
+void proto_register_sua(void);
+void proto_reg_handoff_sua(void);
+
 #define ADD_PADDING(x) ((((x) + 3) >> 2) << 2)
 #define SCTP_PORT_SUA          14001
 
diff --git a/epan/dissectors/packet-symantec.c b/epan/dissectors/packet-symantec.c
index db49e62e9d..341f218171 100644
--- a/epan/dissectors/packet-symantec.c
+++ b/epan/dissectors/packet-symantec.c
@@ -31,6 +31,9 @@
 #include <wiretap/wtap.h>
 #include <epan/etypes.h>
 
+void proto_register_symantec(void);
+void proto_reg_handoff_symantec(void);
+
 static dissector_table_t ethertype_dissector_table;
 
 /* protocols and header fields */
diff --git a/epan/dissectors/packet-sync.c b/epan/dissectors/packet-sync.c
index f0587291b1..6a15e8deef 100644
--- a/epan/dissectors/packet-sync.c
+++ b/epan/dissectors/packet-sync.c
@@ -37,6 +37,9 @@
 #define TYPE_2_LEN 12
 #define TYPE_3_LEN 19
 
+void proto_register_sync(void);
+void proto_reg_handoff_sync(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_sync = -1;
 static int hf_sync_type = -1;
diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c
index cd1c741b06..32fe22f97e 100644
--- a/epan/dissectors/packet-synergy.c
+++ b/epan/dissectors/packet-synergy.c
@@ -32,9 +32,9 @@
 
 #include <epan/packet.h>
 
+void proto_register_synergy(void);
 void proto_reg_handoff_synergy(void);
 
-
 static int proto_synergy = -1;
 
 static int hf_synergy_unknown = -1;
diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c
index eda6823a2d..7d8f5e71b6 100644
--- a/epan/dissectors/packet-synphasor.c
+++ b/epan/dissectors/packet-synphasor.c
@@ -40,6 +40,7 @@
 #define PROTOCOL_ABBREV	    "synphasor"
 
 /* forward references */
+void proto_register_synphasor(void);
 void proto_reg_handoff_synphasor(void);
 
 /* global variables */
diff --git a/epan/dissectors/packet-syslog.c b/epan/dissectors/packet-syslog.c
index fc13bfdebd..d081d2a008 100644
--- a/epan/dissectors/packet-syslog.c
+++ b/epan/dissectors/packet-syslog.c
@@ -43,6 +43,9 @@
 #define PRIORITY_MASK 0x0007  /* 0000 0111 */
 #define FACILITY_MASK 0x03f8  /* 1111 1000 */
 
+void proto_reg_handoff_syslog(void);
+void proto_register_syslog(void);
+
 /* The maximum number if priority digits to read in. */
 #define MAX_DIGITS 3
 
diff --git a/epan/dissectors/packet-t30.c b/epan/dissectors/packet-t30.c
index d68f65e4c8..341e2479fd 100644
--- a/epan/dissectors/packet-t30.c
+++ b/epan/dissectors/packet-t30.c
@@ -37,6 +37,8 @@
 #include "packet-t38.h"
 #include "packet-t30.h"
 
+void proto_reg_handoff_t30(void);
+
 /* T30 */
 static int proto_t30 = -1;
 static int hf_t30_Address = -1;
diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c
index 52ad64e8ee..3b4abf6b2b 100644
--- a/epan/dissectors/packet-tacacs.c
+++ b/epan/dissectors/packet-tacacs.c
@@ -67,6 +67,12 @@
 #include <epan/expert.h>
 #include "packet-tacacs.h"
 
+void proto_reg_handoff_tacacs(void);
+void proto_register_tacacs(void);
+
+void proto_reg_handoff_tacplus(void);
+void proto_register_tacplus(void);
+
 static void md5_xor( guint8 *data, const char *key, int data_len, guint8 *session_id, guint8 version, guint8 seq_no );
 
 static int proto_tacacs = -1;
diff --git a/epan/dissectors/packet-tali.c b/epan/dissectors/packet-tali.c
index 0eb02eba6a..988a77dcd5 100644
--- a/epan/dissectors/packet-tali.c
+++ b/epan/dissectors/packet-tali.c
@@ -60,6 +60,9 @@
 #define TALI_MTP3 "mtp3"
 #define TALI_SAAL "saal"
 
+void proto_reg_handoff_tali(void);
+void proto_register_tali(void);
+
 /* Initialize the subtree pointers */
 static gint ett_tali = -1;
 static gint ett_tali_sync = -1;
diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c
index 668a3ae26d..3974a3221e 100644
--- a/epan/dissectors/packet-tapa.c
+++ b/epan/dissectors/packet-tapa.c
@@ -40,6 +40,9 @@ Specs:
 #include <epan/ipproto.h>
 #include "packet-ip.h"
 
+void proto_reg_handoff_tapa(void);
+void proto_register_tapa(void);
+
 /* protocol handles */
 static int proto_tapa = -1;
 
diff --git a/epan/dissectors/packet-tdmoe.c b/epan/dissectors/packet-tdmoe.c
index c473341133..f433cb9119 100644
--- a/epan/dissectors/packet-tdmoe.c
+++ b/epan/dissectors/packet-tdmoe.c
@@ -35,6 +35,9 @@
 #define TDMOE_YELLOW_ALARM_BITMASK 0x01
 #define TDMOE_SIGBITS_BITMASK      0x02
 
+void proto_reg_handoff_tdmoe(void);
+void proto_register_tdmoe(void);
+
 /* protocols and header fields */
 static int proto_tdmoe = -1;
 
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c
index f22e2e54dc..3de8a1ad6d 100644
--- a/epan/dissectors/packet-tds.c
+++ b/epan/dissectors/packet-tds.c
@@ -417,6 +417,9 @@ static const value_string tds_data_type_names[] = {
     {0, NULL }
 };
 
+void proto_reg_handoff_tds(void);
+void proto_register_tds(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_tds = -1;
 static int hf_tds_type = -1;
diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c
index 1c5f3eca46..9dea2b14ff 100644
--- a/epan/dissectors/packet-teamspeak2.c
+++ b/epan/dissectors/packet-teamspeak2.c
@@ -106,6 +106,8 @@
 #define TS2_STATUS_MUTEMICROPHONE   16
 #define TS2_STATUS_MUTE             32
 
+void proto_reg_handoff_teamspeak2(void);
+void proto_register_teamspeak2(void);
 
 static int hf_msg_fragments = -1;
 static int hf_msg_fragment = -1;
diff --git a/epan/dissectors/packet-teimanagement.c b/epan/dissectors/packet-teimanagement.c
index 785c3d4fa0..b5819ef9a5 100644
--- a/epan/dissectors/packet-teimanagement.c
+++ b/epan/dissectors/packet-teimanagement.c
@@ -37,6 +37,9 @@
  * http://www.acacia-net.com/Clarinet/Protocol/q9213o84.htm
  */
 
+void proto_reg_handoff_teimanagement(void);
+void proto_register_teimanagement(void);
+
 static int proto_tei=-1;
 
 static int lm_entity_id=-1;
diff --git a/epan/dissectors/packet-teklink.c b/epan/dissectors/packet-teklink.c
index 30fbeb63fd..f53df1a34d 100644
--- a/epan/dissectors/packet-teklink.c
+++ b/epan/dissectors/packet-teklink.c
@@ -29,6 +29,9 @@
 
 #define PROGRAM_TEKLINK 0x20400034
 
+void proto_reg_handoff_teklink(void);
+void proto_register_teklink(void);
+
 static int proto_teklink = -1;
 static int hf_teklink_procedure = -1;
 static int hf_teklink_unknown_long = -1;
diff --git a/epan/dissectors/packet-telkonet.c b/epan/dissectors/packet-telkonet.c
index a6109e5fb2..1275b975d1 100644
--- a/epan/dissectors/packet-telkonet.c
+++ b/epan/dissectors/packet-telkonet.c
@@ -37,6 +37,9 @@
 #include <epan/packet.h>
 #include <epan/etypes.h>
 
+void proto_reg_handoff_telkonet(void);
+void proto_register_telkonet(void);
+
 static int proto_telkonet = -1;
 static int hf_telkonet_type = -1;
 
diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c
index e3121c33e5..81861da180 100644
--- a/epan/dissectors/packet-telnet.c
+++ b/epan/dissectors/packet-telnet.c
@@ -40,6 +40,9 @@
 #include "packet-tn3270.h"
 #include "packet-tn5250.h"
 
+void proto_reg_handoff_telnet(void);
+void proto_register_telnet(void);
+
 static int proto_telnet = -1;
 static int hf_telnet_cmd = -1;
 static int hf_telnet_subcmd = -1;
diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c
index 4296be66cb..19b9188470 100644
--- a/epan/dissectors/packet-teredo.c
+++ b/epan/dissectors/packet-teredo.c
@@ -41,6 +41,9 @@
 
 #define UDP_PORT_TEREDO 3544
 
+void proto_reg_handoff_teredo(void);
+void proto_register_teredo(void);
+
 static int teredo_tap = -1;
 
 static int proto_teredo = -1;
diff --git a/epan/dissectors/packet-text-media.c b/epan/dissectors/packet-text-media.c
index e53de719a4..e2e37d98a0 100644
--- a/epan/dissectors/packet-text-media.c
+++ b/epan/dissectors/packet-text-media.c
@@ -44,6 +44,8 @@
  *
  * TODO - character set and chunked transfer-coding
  */
+void proto_register_text_lines(void);
+void proto_reg_handoff_text_lines(void);
 
 /* Filterable header fields */
 static gint proto_text_lines = -1;
diff --git a/epan/dissectors/packet-tfp.c b/epan/dissectors/packet-tfp.c
index e8b50d85c8..3ce040fae4 100644
--- a/epan/dissectors/packet-tfp.c
+++ b/epan/dissectors/packet-tfp.c
@@ -38,6 +38,9 @@
 
 #define BASE58_MAX_STR_SIZE 13
 
+void proto_reg_handoff_tfp(void);
+void proto_register_tfp(void);
+
 /* variables for creating the tree */
 static gint proto_tfp = -1;
 static gint ett_tfp = -1;
diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c
index 3c98eb5f49..2517984abb 100644
--- a/epan/dissectors/packet-tftp.c
+++ b/epan/dissectors/packet-tftp.c
@@ -51,6 +51,8 @@
 #include <epan/range.h>
 #include <epan/prefs.h>
 
+void proto_register_tftp(void);
+
 /* Things we may want to remember for a whole conversation */
 typedef struct _tftp_conv_info_t {
 	guint16 blocksize;
diff --git a/epan/dissectors/packet-time.c b/epan/dissectors/packet-time.c
index dfc81697e7..572e27888b 100644
--- a/epan/dissectors/packet-time.c
+++ b/epan/dissectors/packet-time.c
@@ -31,6 +31,8 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
+void proto_reg_handoff_time(void);
+void proto_register_time(void);
 
 static const enum_val_t time_display_types[] = {
     { "UTC", "UTC", ABSOLUTE_TIME_UTC },
diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c
index 7287f3f4c2..7fb61a45b6 100644
--- a/epan/dissectors/packet-tipc.c
+++ b/epan/dissectors/packet-tipc.c
@@ -42,6 +42,8 @@
 
 #include "packet-tcp.h"
 
+void proto_register_tipc(void);
+
 static int proto_tipc = -1;
 
 /* dissector handles */
diff --git a/epan/dissectors/packet-tivoconnect.c b/epan/dissectors/packet-tivoconnect.c
index 434319df3d..36088a847b 100644
--- a/epan/dissectors/packet-tivoconnect.c
+++ b/epan/dissectors/packet-tivoconnect.c
@@ -47,6 +47,7 @@
 
 /* Forward declaration we need below */
 void proto_reg_handoff_tivoconnect(void);
+void proto_register_tivoconnect(void);
 
 /* Initialize the protocol and registered fields */
 static int proto_tivoconnect = -1;
diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c
index 15c22f97df..12b0b979b0 100644
--- a/epan/dissectors/packet-tnef.c
+++ b/epan/dissectors/packet-tnef.c
@@ -88,6 +88,9 @@
 #define ATT_OEM_CODEPAGE              (0x00069007) /* handled */
 #define ATT_ORIGINAL_MESSAGE_CLASS    (0x00079008) /* handled */
 
+void proto_register_tnef(void);
+void proto_reg_handoff_tnef(void);
+
 static int proto_tnef = -1;
 
 static int hf_tnef_signature = -1;
diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c
index ba2958c54a..b29d68e6bc 100644
--- a/epan/dissectors/packet-tns.c
+++ b/epan/dissectors/packet-tns.c
@@ -33,6 +33,8 @@
 
 #include <epan/prefs.h>
 
+void proto_register_tns(void);
+
 /* desegmentation of TNS over TCP */
 static gboolean tns_desegment = TRUE;
 
diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c
index 73c1ec761b..b7b574f4f8 100644
--- a/epan/dissectors/packet-tpkt.c
+++ b/epan/dissectors/packet-tpkt.c
@@ -41,6 +41,9 @@
 
 #include "packet-tpkt.h"
 
+void proto_register_tpkt(void);
+void proto_reg_handoff_tpkt(void);
+
 /* TPKT header fields             */
 static int proto_tpkt          = -1;
 static protocol_t *proto_tpkt_ptr;
diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c
index 1b03430c7b..5fe8a1efab 100644
--- a/epan/dissectors/packet-tpncp.c
+++ b/epan/dissectors/packet-tpncp.c
@@ -61,6 +61,9 @@
 
 /*-------------------------------------------------------------------------------------------------------------------------------------------*/
 
+void proto_register_tpncp(void);
+void proto_reg_handoff_tpncp(void);
+
 /* The linked list for storing information about specific data fields. */
 typedef struct tpncp_data_field_info
 {
diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c
index 63b7e0d5fe..483ea73ade 100644
--- a/epan/dissectors/packet-tr.c
+++ b/epan/dissectors/packet-tr.c
@@ -36,6 +36,9 @@
 #include <epan/tap.h>
 #include <epan/wmem/wmem.h>
 
+void proto_register_tr(void);
+void proto_reg_handoff_tr(void);
+
 static int proto_tr = -1;
 static int hf_tr_dst = -1;
 static int hf_tr_src = -1;
diff --git a/epan/dissectors/packet-trill.c b/epan/dissectors/packet-trill.c
index d3134a5bd3..807ce1f583 100644
--- a/epan/dissectors/packet-trill.c
+++ b/epan/dissectors/packet-trill.c
@@ -33,6 +33,9 @@
 #include <epan/packet.h>
 #include <epan/etypes.h>
 
+void proto_register_trill(void);
+void proto_reg_handoff_trill(void);
+
 static int proto_trill = -1 ;
 static gint ett_trill = -1 ;
 
diff --git a/epan/dissectors/packet-tsp.c b/epan/dissectors/packet-tsp.c
index 66d7df86e0..4db9284a72 100644
--- a/epan/dissectors/packet-tsp.c
+++ b/epan/dissectors/packet-tsp.c
@@ -35,6 +35,8 @@
  * For a full documentation of the Time Synchronization Protocol (TSP) see:
  * http://docs.freebsd.org/44doc/smm/12.timed/paper.pdf
  */
+void proto_register_tsp(void);
+void proto_reg_handoff_tsp(void);
 
 static int proto_tsp = -1;
 static int hf_tsp_type = -1;
diff --git a/epan/dissectors/packet-tte-pcf.c b/epan/dissectors/packet-tte-pcf.c
index 8b5b694b44..9800941565 100644
--- a/epan/dissectors/packet-tte-pcf.c
+++ b/epan/dissectors/packet-tte-pcf.c
@@ -38,6 +38,9 @@
 
 #include "packet-tte.h"
 
+void proto_register_tte_pcf(void);
+void proto_reg_handoff_tte_pcf(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_tte_pcf = -1;
 
diff --git a/epan/dissectors/packet-tte.c b/epan/dissectors/packet-tte.c
index b749d790a7..07019c8ae7 100644
--- a/epan/dissectors/packet-tte.c
+++ b/epan/dissectors/packet-tte.c
@@ -39,6 +39,9 @@
 
 #include "packet-tte.h"
 
+void proto_register_tte(void);
+void proto_reg_handoff_tte(void);
+
 static dissector_handle_t ethertype_handle;
 
 /* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c
index 4af4a21cd8..67e54c8919 100644
--- a/epan/dissectors/packet-turbocell.c
+++ b/epan/dissectors/packet-turbocell.c
@@ -62,6 +62,9 @@
             "connected stations / satellites ?", HFILL } \
         }
 
+void proto_register_turbocell(void);
+void proto_reg_handoff_turbocell(void);
+
 /* Initialize the protocol and registered fields */
 
 static int proto_turbocell = -1;
diff --git a/epan/dissectors/packet-turnchannel.c b/epan/dissectors/packet-turnchannel.c
index 2fa4c0f19c..d48d83c75f 100644
--- a/epan/dissectors/packet-turnchannel.c
+++ b/epan/dissectors/packet-turnchannel.c
@@ -38,6 +38,9 @@
 #include <epan/packet.h>
 #include <packet-tcp.h>
 
+void proto_register_turnchannel(void);
+void proto_reg_handoff_turnchannel(void);
+
 /* heuristic subdissectors */
 static heur_dissector_list_t heur_subdissector_list;
 
diff --git a/epan/dissectors/packet-tuxedo.c b/epan/dissectors/packet-tuxedo.c
index 04481e39f5..2f743410e7 100644
--- a/epan/dissectors/packet-tuxedo.c
+++ b/epan/dissectors/packet-tuxedo.c
@@ -30,6 +30,9 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 
+void proto_register_tuxedo(void);
+void proto_reg_handoff_tuxedo(void);
+
 static int proto_tuxedo = -1;
 static int hf_tuxedo_magic = -1;
 static int hf_tuxedo_opcode = -1;
-- 
cgit v1.2.3