svn path=/trunk/; revision=48440

4 files changed, 18 insertions, 6 deletions

diff --git a/asn1/acp133/packet-acp133-template.c b/asn1/acp133/packet-acp133-template.c
index 18ca3e5a12..67f141ab03 100644
--- a/asn1/acp133/packet-acp133-template.c
+++ b/asn1/acp133/packet-acp133-template.c
@@ -44,6 +44,9 @@
 #define PSNAME "ACP133"
 #define PFNAME "acp133"
 
+void proto_register_acp133(void);
+void proto_reg_handoff_acp133(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_acp133 = -1;
 
diff --git a/asn1/ansi_tcap/packet-ansi_tcap-template.c b/asn1/ansi_tcap/packet-ansi_tcap-template.c
index 2f31674f37..86f07ab0aa 100644
--- a/asn1/ansi_tcap/packet-ansi_tcap-template.c
+++ b/asn1/ansi_tcap/packet-ansi_tcap-template.c
@@ -44,6 +44,8 @@
 #define PSNAME "ANSI_TCAP"
 #define PFNAME "ansi_tcap"
 
+void proto_register_ansi_tcap(void);
+void proto_reg_handoff_ansi_tcap(void);
 
 /* Preferences defaults */
 gint ansi_tcap_response_matching_type = 0;
diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c
index d554320c43..a37ae95e5d 100644
--- a/asn1/cmip/packet-cmip-template.c
+++ b/asn1/cmip/packet-cmip-template.c
@@ -39,6 +39,9 @@
 #define PSNAME "CMIP"
 #define PFNAME "cmip"
 
+void proto_register_cmip(void);
+void proto_reg_handoff_cmip(void);
+
 /* XXX some stuff we need until we can get rid of it */
 #include "packet-ses.h"
 #include "packet-pres.h"
diff --git a/asn1/rrc/packet-rrc-template.c b/asn1/rrc/packet-rrc-template.c
index 984df58ef3..ca8b6e21c9 100644
--- a/asn1/rrc/packet-rrc-template.c
+++ b/asn1/rrc/packet-rrc-template.c
@@ -85,6 +85,8 @@ enum nas_sys_info_gsm_map {
 static guint32 rrc_nas_sys_info_gsm_map_type = RRC_NAS_SYS_INFO_CN_COMMON;
 
 /* Forward declarations */
+void proto_register_rrc(void);
+void proto_reg_handoff_rrc(void);
 static int dissect_UE_RadioAccessCapabilityInfo_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
 static int dissect_SysInfoTypeSB1_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
 static int dissect_SysInfoTypeSB2_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
@@ -164,19 +166,21 @@ static int get_max_counter(int com_context){
 }
 #endif
 /** Utility functions used for various comparisons/cleanups in tree **/
-gint rrc_key_cmp(gconstpointer b_ptr, gconstpointer a_ptr, gpointer ignore _U_){
+static gint rrc_key_cmp(gconstpointer b_ptr, gconstpointer a_ptr, gpointer ignore _U_){
     if( GPOINTER_TO_INT(a_ptr) > GPOINTER_TO_INT(b_ptr) ){
         return  -1;
     }
     return GPOINTER_TO_INT(a_ptr) < GPOINTER_TO_INT(b_ptr);
 }
-void rrc_free_key(gpointer key _U_){
+
+static void rrc_free_key(gpointer key _U_){
             /*Keys should be de allocated elsewhere.*/
 
-    }
-void rrc_free_value(gpointer value ){
+}
+
+static void rrc_free_value(gpointer value ){
             g_free(value);
-    }
+}
 #include "packet-rrc-fn.c"
 
 #include "packet-rrc.h"
@@ -231,7 +235,7 @@ dissect_rrc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     }
 }
 
-void rrc_init(void){
+static void rrc_init(void){
     /*Cleanup*/
     if(hsdsch_muxed_flows){
         g_tree_destroy(hsdsch_muxed_flows);