- Forward declaration of register functions.

svn path=/trunk/; revision=53860

11 files changed, 69 insertions, 37 deletions

diff --git a/asn1/isdn-sup/Makefile.common b/asn1/isdn-sup/Makefile.common
index ca766428d0..bea01038dc 100644
--- a/asn1/isdn-sup/Makefile.common
+++ b/asn1/isdn-sup/Makefile.common
@@ -51,7 +51,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -k
+A2W_FLAGS= -b
 
 EXTRA_CNF =
 
diff --git a/asn1/isdn-sup/packet-isdn-sup-template.c b/asn1/isdn-sup/packet-isdn-sup-template.c
index ed0f6b3567..94a75fe683 100644
--- a/asn1/isdn-sup/packet-isdn-sup-template.c
+++ b/asn1/isdn-sup/packet-isdn-sup-template.c
@@ -37,6 +37,9 @@
 #define PSNAME "ISDN_SUP"
 #define PFNAME "isdn_sup"
 
+void proto_register_isdn_sup(void);
+void proto_reg_handoff_isdn_sup(void);
+
 #include "packet-isdn-sup-val.h"
 
 /* Initialize the protocol and registered fields */
diff --git a/asn1/lcsap/packet-lcsap-template.c b/asn1/lcsap/packet-lcsap-template.c
index 9a7899704d..bec9615877 100644
--- a/asn1/lcsap/packet-lcsap-template.c
+++ b/asn1/lcsap/packet-lcsap-template.c
@@ -45,6 +45,7 @@
 #include "packet-per.h"
 #include "packet-e212.h"
 #include "packet-sccp.h"
+#include "packet-lcsap.h"
 
 #ifdef _MSC_VER
 /* disable: "warning C4146: unary minus operator applied to unsigned type, result still unsigned" */
@@ -55,6 +56,9 @@
 #define PSNAME "LCSAP"
 #define PFNAME "lcsap"
 
+void proto_register_lcsap(void);
+void proto_reg_handoff_lcsap(void);
+
 static dissector_handle_t lpp_handle;
 static dissector_handle_t lppa_handle;
 
diff --git a/asn1/logotypecertextn/packet-logotypecertextn-template.c b/asn1/logotypecertextn/packet-logotypecertextn-template.c
index 624e9c1a4a..011f509ca6 100644
--- a/asn1/logotypecertextn/packet-logotypecertextn-template.c
+++ b/asn1/logotypecertextn/packet-logotypecertextn-template.c
@@ -36,6 +36,9 @@
 #define PSNAME "LogotypeCertExtn"
 #define PFNAME "logotypecertextn"
 
+void proto_register_logotypecertextn(void);
+void proto_reg_handoff_logotypecertextn(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_logotypecertextn = -1;
 #include "packet-logotypecertextn-hf.c"
diff --git a/asn1/lppa/packet-lppa-template.c b/asn1/lppa/packet-lppa-template.c
index d67b7321a4..a6df40760f 100644
--- a/asn1/lppa/packet-lppa-template.c
+++ b/asn1/lppa/packet-lppa-template.c
@@ -38,6 +38,9 @@
 #define PSNAME "LPPa"
 #define PFNAME "lppa"
 
+void proto_register_lppa(void);
+void proto_reg_handoff_lppa(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_lppa = -1;
 
diff --git a/asn1/mms/packet-mms-template.c b/asn1/mms/packet-mms-template.c
index 421cf8dcbb..e24c2a59d2 100644
--- a/asn1/mms/packet-mms-template.c
+++ b/asn1/mms/packet-mms-template.c
@@ -39,6 +39,9 @@
 #define PSNAME "MMS"
 #define PFNAME "mms"
 
+void proto_register_mms(void);
+void proto_reg_handoff_mms(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_mms = -1;
 
diff --git a/epan/dissectors/packet-isdn-sup.c b/epan/dissectors/packet-isdn-sup.c
index 7e3b96caf6..c42ee172da 100644
--- a/epan/dissectors/packet-isdn-sup.c
+++ b/epan/dissectors/packet-isdn-sup.c
@@ -45,13 +45,16 @@
 #define PSNAME "ISDN_SUP"
 #define PFNAME "isdn_sup"
 
+void proto_register_isdn_sup(void);
+void proto_reg_handoff_isdn_sup(void);
+
 
 /*--- Included file: packet-isdn-sup-val.h ---*/
 #line 1 "../../asn1/isdn-sup/packet-isdn-sup-val.h"
 #define fPHOID                         "0.4.0.210.1"
 
 /*--- End of included file: packet-isdn-sup-val.h ---*/
-#line 41 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 44 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
 
 /* Initialize the protocol and registered fields */
 static int proto_isdn_sup = -1;
@@ -118,7 +121,7 @@ static const value_string isdn_sup_str_operation[] = {
   {  46, "partyDISC" },
 
 /*--- End of included file: packet-isdn-sup-table10.c ---*/
-#line 74 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 77 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
   {   0, NULL}
 };
 
@@ -159,7 +162,7 @@ static const value_string isdn_sup_str_error[] = {
   {    2, "rejectedByTheUser" },
 
 /*--- End of included file: packet-isdn-sup-table20.c ---*/
-#line 80 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 83 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
   {   0, NULL}
 };
 
@@ -326,7 +329,7 @@ static int hf_isdn_sup_fPHReference = -1;         /* FPHReference */
 static int hf_isdn_sup_calledFreephoneNr = -1;    /* CalledFreephoneNr */
 
 /*--- End of included file: packet-isdn-sup-hf.c ---*/
-#line 86 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 89 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
 
 
 /* Initialize the subtree pointers */
@@ -401,7 +404,7 @@ static gint ett_isdn_sup_Free_T_FPHArg = -1;
 static gint ett_isdn_sup_Call_T_FPHArg = -1;
 
 /*--- End of included file: packet-isdn-sup-ett.c ---*/
-#line 92 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 95 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
 
 
 /* Preference settings default */
@@ -2497,7 +2500,7 @@ static int dissect_Call_T_FPHArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
 
 
 /*--- End of included file: packet-isdn-sup-fn.c ---*/
-#line 99 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 102 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
 
 static const isdn_sup_op_t isdn_sup_op_tab[] = {
 
@@ -2534,7 +2537,7 @@ static const isdn_sup_op_t isdn_sup_op_tab[] = {
   /* userUserService          */ {   1, dissect_UserUserServiceArg_PDU, NULL },
 
 /*--- End of included file: packet-isdn-sup-table11.c ---*/
-#line 102 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 105 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
 };
 
 
@@ -2549,7 +2552,7 @@ static const isdn_sup_global_op_t isdn_sup_global_op_tab[] = {
   /* call-T-FPH               */ { fPHOID".4", dissect_Call_T_FPHArg_PDU, NULL },
 
 /*--- End of included file: packet-isdn-sup-table31.c ---*/
-#line 108 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 111 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
 };
 
 static const isdn_sup_err_t isdn_sup_err_tab[] = {
@@ -2588,7 +2591,7 @@ static const isdn_sup_err_t isdn_sup_err_tab[] = {
   /* rejectedByTheUser        */ {    2, NULL },
 
 /*--- End of included file: packet-isdn-sup-table21.c ---*/
-#line 112 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 115 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
 };
 
 
@@ -3441,7 +3444,7 @@ void proto_register_isdn_sup(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-isdn-sup-hfarr.c ---*/
-#line 336 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 339 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
   };
 
   /* List of subtrees */
@@ -3517,7 +3520,7 @@ void proto_register_isdn_sup(void) {
     &ett_isdn_sup_Call_T_FPHArg,
 
 /*--- End of included file: packet-isdn-sup-ettarr.c ---*/
-#line 343 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
+#line 346 "../../asn1/isdn-sup/packet-isdn-sup-template.c"
   };
 
   /* Register fields and subtrees */
diff --git a/epan/dissectors/packet-lcsap.c b/epan/dissectors/packet-lcsap.c
index 8c404d067a..1983d59037 100644
--- a/epan/dissectors/packet-lcsap.c
+++ b/epan/dissectors/packet-lcsap.c
@@ -53,6 +53,7 @@
 #include "packet-per.h"
 #include "packet-e212.h"
 #include "packet-sccp.h"
+#include "packet-lcsap.h"
 
 #ifdef _MSC_VER
 /* disable: "warning C4146: unary minus operator applied to unsigned type, result still unsigned" */
@@ -63,6 +64,9 @@
 #define PSNAME "LCSAP"
 #define PFNAME "lcsap"
 
+void proto_register_lcsap(void);
+void proto_reg_handoff_lcsap(void);
+
 static dissector_handle_t lpp_handle;
 static dissector_handle_t lppa_handle;
 
@@ -111,7 +115,7 @@ typedef enum _ProtocolIE_ID_enum {
 } ProtocolIE_ID_enum;
 
 /*--- End of included file: packet-lcsap-val.h ---*/
-#line 63 "../../asn1/lcsap/packet-lcsap-template.c"
+#line 67 "../../asn1/lcsap/packet-lcsap-template.c"
 /* Strcture to hold ProcedureCode */
 struct pro_code {
         guint8 code;
@@ -238,7 +242,7 @@ static int hf_lcsap_successfulOutcome_value = -1;  /* SuccessfulOutcome_value */
 static int hf_lcsap_unsuccessfulOutcome_value = -1;  /* UnsuccessfulOutcome_value */
 
 /*--- End of included file: packet-lcsap-hf.c ---*/
-#line 77 "../../asn1/lcsap/packet-lcsap-template.c"
+#line 81 "../../asn1/lcsap/packet-lcsap-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_lcsap = -1;
@@ -293,7 +297,7 @@ static gint ett_lcsap_SuccessfulOutcome = -1;
 static gint ett_lcsap_UnsuccessfulOutcome = -1;
 
 /*--- End of included file: packet-lcsap-ett.c ---*/
-#line 82 "../../asn1/lcsap/packet-lcsap-template.c"
+#line 86 "../../asn1/lcsap/packet-lcsap-template.c"
 
 /* Global variables */
 static guint32 ProcedureCode;
@@ -2219,7 +2223,7 @@ static int dissect_LCS_AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro
 
 
 /*--- End of included file: packet-lcsap-fn.c ---*/
-#line 197 "../../asn1/lcsap/packet-lcsap-template.c"
+#line 201 "../../asn1/lcsap/packet-lcsap-template.c"
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
@@ -2318,7 +2322,7 @@ proto_reg_handoff_lcsap(void)
 
 
 /*--- End of included file: packet-lcsap-dis-tab.c ---*/
-#line 257 "../../asn1/lcsap/packet-lcsap-template.c"
+#line 261 "../../asn1/lcsap/packet-lcsap-template.c"
 	} else {
 		if (SctpPort != 0) {
 			dissector_delete_uint("sctp.port", SctpPort, lcsap_handle);
@@ -2800,7 +2804,7 @@ void proto_register_lcsap(void) {
         "UnsuccessfulOutcome_value", HFILL }},
 
 /*--- End of included file: packet-lcsap-hfarr.c ---*/
-#line 302 "../../asn1/lcsap/packet-lcsap-template.c"
+#line 306 "../../asn1/lcsap/packet-lcsap-template.c"
   };
 
   /* List of subtrees */
@@ -2856,7 +2860,7 @@ void proto_register_lcsap(void) {
     &ett_lcsap_UnsuccessfulOutcome,
 
 /*--- End of included file: packet-lcsap-ettarr.c ---*/
-#line 308 "../../asn1/lcsap/packet-lcsap-template.c"
+#line 312 "../../asn1/lcsap/packet-lcsap-template.c"
  };
 
   module_t *lcsap_module;
diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c
index 45700beb8d..f5c0ad570d 100644
--- a/epan/dissectors/packet-logotypecertextn.c
+++ b/epan/dissectors/packet-logotypecertextn.c
@@ -44,6 +44,9 @@
 #define PSNAME "LogotypeCertExtn"
 #define PFNAME "logotypecertextn"
 
+void proto_register_logotypecertextn(void);
+void proto_reg_handoff_logotypecertextn(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_logotypecertextn = -1;
 
@@ -92,7 +95,7 @@ static int hf_logotypecertextn_hashAlg = -1;      /* AlgorithmIdentifier */
 static int hf_logotypecertextn_hashValue = -1;    /* OCTET_STRING */
 
 /*--- End of included file: packet-logotypecertextn-hf.c ---*/
-#line 42 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c"
+#line 45 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -119,7 +122,7 @@ static gint ett_logotypecertextn_T_refStructURI = -1;
 static gint ett_logotypecertextn_HashAlgAndValue = -1;
 
 /*--- End of included file: packet-logotypecertextn-ett.c ---*/
-#line 45 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c"
+#line 48 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c"
 
 
 
@@ -516,7 +519,7 @@ static void dissect_LogotypeExtn_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
 
 
 /*--- End of included file: packet-logotypecertextn-fn.c ---*/
-#line 48 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c"
+#line 51 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c"
 
 
 /*--- proto_register_logotypecertextn ----------------------------------------------*/
@@ -693,7 +696,7 @@ void proto_register_logotypecertextn(void) {
         "OCTET_STRING", HFILL }},
 
 /*--- End of included file: packet-logotypecertextn-hfarr.c ---*/
-#line 56 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c"
+#line 59 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c"
   };
 
   /* List of subtrees */
@@ -722,7 +725,7 @@ void proto_register_logotypecertextn(void) {
     &ett_logotypecertextn_HashAlgAndValue,
 
 /*--- End of included file: packet-logotypecertextn-ettarr.c ---*/
-#line 61 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c"
+#line 64 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c"
   };
 
   /* Register protocol */
@@ -746,6 +749,6 @@ void proto_reg_handoff_logotypecertextn(void) {
 
 
 /*--- End of included file: packet-logotypecertextn-dis-tab.c ---*/
-#line 76 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c"
+#line 79 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c"
 }
 
diff --git a/epan/dissectors/packet-lppa.c b/epan/dissectors/packet-lppa.c
index b9f752a955..46f4e6ffbc 100644
--- a/epan/dissectors/packet-lppa.c
+++ b/epan/dissectors/packet-lppa.c
@@ -46,6 +46,9 @@
 #define PSNAME "LPPa"
 #define PFNAME "lppa"
 
+void proto_register_lppa(void);
+void proto_reg_handoff_lppa(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_lppa = -1;
 
@@ -186,7 +189,7 @@ static int hf_lppa_oTDOA_Information_Type_Item = -1;  /* OTDOA_Information_Item
 static int hf_lppa_privateIEs = -1;               /* PrivateIE_Container */
 
 /*--- End of included file: packet-lppa-hf.c ---*/
-#line 45 "../../asn1/lppa/packet-lppa-template.c"
+#line 48 "../../asn1/lppa/packet-lppa-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_lppa = -1;
@@ -247,7 +250,7 @@ static gint ett_lppa_ErrorIndication = -1;
 static gint ett_lppa_PrivateMessage = -1;
 
 /*--- End of included file: packet-lppa-ett.c ---*/
-#line 49 "../../asn1/lppa/packet-lppa-template.c"
+#line 52 "../../asn1/lppa/packet-lppa-template.c"
 
 /* Global variables */
 static guint32 ProcedureCode;
@@ -303,7 +306,7 @@ typedef enum _ProtocolIE_ID_enum {
 } ProtocolIE_ID_enum;
 
 /*--- End of included file: packet-lppa-val.h ---*/
-#line 62 "../../asn1/lppa/packet-lppa-template.c"
+#line 65 "../../asn1/lppa/packet-lppa-template.c"
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
@@ -2303,7 +2306,7 @@ static int dissect_PrivateMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
 
 
 /*--- End of included file: packet-lppa-fn.c ---*/
-#line 69 "../../asn1/lppa/packet-lppa-template.c"
+#line 72 "../../asn1/lppa/packet-lppa-template.c"
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
@@ -2864,7 +2867,7 @@ void proto_register_lppa(void) {
         "PrivateIE_Container", HFILL }},
 
 /*--- End of included file: packet-lppa-hfarr.c ---*/
-#line 97 "../../asn1/lppa/packet-lppa-template.c"
+#line 100 "../../asn1/lppa/packet-lppa-template.c"
   };
 
   /* List of subtrees */
@@ -2927,7 +2930,7 @@ void proto_register_lppa(void) {
     &ett_lppa_PrivateMessage,
 
 /*--- End of included file: packet-lppa-ettarr.c ---*/
-#line 103 "../../asn1/lppa/packet-lppa-template.c"
+#line 106 "../../asn1/lppa/packet-lppa-template.c"
   };
 
   /* Register protocol */
@@ -2984,5 +2987,5 @@ proto_reg_handoff_lppa(void)
 
 
 /*--- End of included file: packet-lppa-dis-tab.c ---*/
-#line 125 "../../asn1/lppa/packet-lppa-template.c"
+#line 128 "../../asn1/lppa/packet-lppa-template.c"
 }
diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c
index a2054c20c0..d4552556a2 100644
--- a/epan/dissectors/packet-mms.c
+++ b/epan/dissectors/packet-mms.c
@@ -47,6 +47,9 @@
 #define PSNAME "MMS"
 #define PFNAME "mms"
 
+void proto_register_mms(void);
+void proto_reg_handoff_mms(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_mms = -1;
 
@@ -722,7 +725,7 @@ static int hf_mms_Transitions_idle_to_active = -1;
 static int hf_mms_Transitions_any_to_deleted = -1;
 
 /*--- End of included file: packet-mms-hf.c ---*/
-#line 46 "../../asn1/mms/packet-mms-template.c"
+#line 49 "../../asn1/mms/packet-mms-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_mms = -1;
@@ -939,7 +942,7 @@ static gint ett_mms_DirectoryEntry = -1;
 static gint ett_mms_FileAttributes = -1;
 
 /*--- End of included file: packet-mms-ett.c ---*/
-#line 50 "../../asn1/mms/packet-mms-template.c"
+#line 53 "../../asn1/mms/packet-mms-template.c"
 
 static expert_field ei_mms_mal_timeofday_encoding = EI_INIT;
 static expert_field ei_mms_mal_utctime_encoding = EI_INIT;
@@ -7046,7 +7049,7 @@ dissect_mms_MMSpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
 
 
 /*--- End of included file: packet-mms-fn.c ---*/
-#line 55 "../../asn1/mms/packet-mms-template.c"
+#line 58 "../../asn1/mms/packet-mms-template.c"
 
 /*
 * Dissect MMS PDUs inside a PPDU.
@@ -9754,7 +9757,7 @@ void proto_register_mms(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-mms-hfarr.c ---*/
-#line 94 "../../asn1/mms/packet-mms-template.c"
+#line 97 "../../asn1/mms/packet-mms-template.c"
   };
 
   /* List of subtrees */
@@ -9973,7 +9976,7 @@ void proto_register_mms(void) {
     &ett_mms_FileAttributes,
 
 /*--- End of included file: packet-mms-ettarr.c ---*/
-#line 100 "../../asn1/mms/packet-mms-template.c"
+#line 103 "../../asn1/mms/packet-mms-template.c"
   };
 
   static ei_register_info ei[] = {