Fix [-Wmissing-prototypes]

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

diff --git a/epan/conversation.c b/epan/conversation.c
index 848775b1a3f35e9a4f5a62858435720bd1c77395..b99fe4c4a927ce7eb41ec01bc2fc9b30341e199d 100644 (file)
--- a/epan/conversation.c
+++ b/epan/conversation.c
@@ -541,7 +541,7 @@ conversation_init(void)
  *
  * Mostly adapted from the old conversation_new().
  */
-void
+static void
 conversation_insert_into_hashtable(GHashTable *hashtable, conversation_t *conv)
 {
        conversation_t *chain_head, *chain_tail, *cur, *prev;
@@ -595,7 +595,7 @@ conversation_insert_into_hashtable(GHashTable *hashtable, conversation_t *conv)
  * Does the right thing when removing from one of the conversation hash tables,
  * taking into account ordering and hash chains and all that good stuff.
  */
-void
+static void
 conversation_remove_from_hashtable(GHashTable *hashtable, conversation_t *conv)
 {
        conversation_t *chain_head, *cur, *prev;

diff --git a/epan/dissectors/packet-isis-snp.c b/epan/dissectors/packet-isis-snp.c
index dd9c58b92946744b0b5311d975cb1255151e0f66..713242cfa38568ea0c4251e4a1d17a2a3fa6f53c 100644 (file)
--- a/epan/dissectors/packet-isis-snp.c
+++ b/epan/dissectors/packet-isis-snp.c
@@ -32,6 +32,15 @@
 #include "packet-isis.h"
 #include "packet-isis-clv.h"
 
+void proto_register_isis_csnp(void);
+void proto_reg_handoff_isis_csnp(void);
+void proto_register_isis_psnp(void);
+void proto_reg_handoff_isis_psnp(void);
+void proto_register_isis_lsp(void);
+void proto_reg_handoff_isis_lsp(void);
+void proto_register_isis_hello(void);
+void proto_reg_handoff_isis_hello(void);
+
 static int proto_isis_csnp = -1;
 static int proto_isis_psnp = -1;
 

diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c
index 1dbd53db3ee1b4936628f32eeb31eae11e1f7e8b..5abffe4e7326a710b948624d97f15548b53fef7a 100644 (file)
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/gryphon/packet-gryphon.c
@@ -38,6 +38,9 @@
  *     http://www.dgtech.com/gryphon/sys/www/docs/html/
  */
 
+void proto_register_gryphon(void);
+void proto_reg_handoff_gryphon(void);
+
 static int proto_gryphon = -1;
 
 static int hf_gryphon_src = -1;

diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c
index 584c1afa5ec78f08761eef7687924f4eacdcecb7..42035ddfc6fd02a71627762879caf85968650127 100644 (file)
--- a/plugins/irda/packet-irda.c
+++ b/plugins/irda/packet-irda.c
@@ -138,6 +138,9 @@
 #define TTP_PARAMETERS         0x80
 #define TTP_MORE               0x80
 
+void proto_reg_handoff_irda(void);
+void proto_register_irda(void);
+
 static dissector_handle_t data_handle;
 
 /* Initialize the protocol and registered fields */

diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c
index 3259aaea1a605ca5643ac45921c8feba244b1e77..acf15bcd43d233e6b9a6ca1c8b8c3083177b0d8a 100644 (file)
--- a/plugins/irda/packet-sir.c
+++ b/plugins/irda/packet-sir.c
@@ -45,6 +45,8 @@
 /** Escapes this character. */
 #define SIR_ESCAPE(x) ((x)^0x20)
 
+void proto_reg_handoff_irsir(void);
+void proto_register_irsir(void);
 
 /** Protocol handles. */
 static dissector_handle_t data_handle;

diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c
index 618e77307b1bad22bc78f9547974419e4e2d5598..e8d91414b43aef27e5290c0c27d408ef024d48c0 100644 (file)
--- a/plugins/m2m/packet-m2m.c
+++ b/plugins/m2m/packet-m2m.c
@@ -38,6 +38,8 @@
 #include <plugins/wimax/wimax_tlv.h>
 
 /* forward reference */
+void proto_reg_handoff_m2m(void);
+void proto_register_m2m(void);
 static void fch_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint length, packet_info *pinfo);
 static void cdma_code_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint length, packet_info *pinfo);
 static void pdu_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint length, packet_info *pinfo, gint burst_number, gint frag_type, gint frag_number);

diff --git a/tools/make-dissector-reg.py b/tools/make-dissector-reg.py
index 29e25816914191e80d137232a4941327693e7909..5a6012761c70751e56d28a3f36b449ec4c4262db 100755 (executable)
--- a/tools/make-dissector-reg.py
+++ b/tools/make-dissector-reg.py
@@ -205,6 +205,7 @@ if registertype == "plugin" or registertype == "plugin_wtap":
 #include "ws_symbol_export.h"
 
 #ifndef ENABLE_STATIC
+WS_DLL_PUBLIC_DEF void plugin_register (void);
 WS_DLL_PUBLIC_DEF const gchar version[] = VERSION;
 
 /* Start the functions we need for the plugin stuff */