In a source file that defines external functions, the header file that

declares the functions must be included, in order to make sure the
declarations match the function signature.  Make it so - which means
creating the header file in the first place.

Also, declare proto_register_wimax_compact_dlmap_ie() early in
wimax_compact_dlmap_ie_decoder.c, similar to what we do in
wimax_copact_ulmap_ie_decoder.c.

svn path=/trunk/; revision=54739

6 files changed, 76 insertions, 4 deletions

diff --git a/plugins/wimax/Makefile.common b/plugins/wimax/Makefile.common
index d070ff6561..b7e0600ecf 100644
--- a/plugins/wimax/Makefile.common
+++ b/plugins/wimax/Makefile.common
@@ -79,6 +79,8 @@ NONGENERATED_C_FILES = \
 CLEAN_HEADER_FILES = \
 	crc.h		\
 	wimax_bits.h	\
+	wimax_compact_dlmap_ie_decoder.h	\
+	wimax_compact_ulmap_ie_decoder.h	\
 	wimax_mac.h	\
 	wimax_tlv.h	\
 	wimax_utils.h
diff --git a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c b/plugins/wimax/wimax_compact_dlmap_ie_decoder.c
index e7a905f41e..675ed00ce3 100644
--- a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c
+++ b/plugins/wimax/wimax_compact_dlmap_ie_decoder.c
@@ -34,6 +34,7 @@
 #include <epan/packet.h>
 #include "crc.h"
 #include "wimax_tlv.h"
+#include "wimax_compact_dlmap_ie_decoder.h"
 
 extern gint proto_wimax;
 
@@ -46,6 +47,8 @@ extern gint proto_wimax;
 #define CID_TYPE_RCID7       2
 #define CID_TYPE_RCID3       3
 
+void proto_register_wimax_compact_dlmap_ie(void);
+
 /* Global Variables */
 guint cid_type = 0;
 guint band_amc_subchannel_type = 0;
diff --git a/plugins/wimax/wimax_compact_dlmap_ie_decoder.h b/plugins/wimax/wimax_compact_dlmap_ie_decoder.h
new file mode 100644
index 0000000000..73e572c7b4
--- /dev/null
+++ b/plugins/wimax/wimax_compact_dlmap_ie_decoder.h
@@ -0,0 +1,34 @@
+/* wimax_compact_dlmap_ie_decoder.h
+ * Declarations of routines exported by WiMax HARQ Map Message decoder
+ *
+ * Copyright (c) 2007 by Intel Corporation.
+ *
+ * Author: Lu Pan <lu.pan@intel.com>
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1999 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef _WIMAX_COMPACT_DLMAP_IE_DECODER_H_
+#define _WIMAX_COMPACT_DLMAP_IE_DECODER_H_
+
+extern guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset);
+
+#endif /* _WIMAX_COMPACT_DLMAP_IE_DECODER_H_ */
diff --git a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c
index 5aee09314c..3f6ae3d8df 100644
--- a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c
+++ b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c
@@ -33,6 +33,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "crc.h"
+#include "wimax_compact_ulmap_ie_decoder.h"
 
 /* MASKs */
 #define MSB_NIBBLE_MASK      0xF0
diff --git a/plugins/wimax/wimax_compact_ulmap_ie_decoder.h b/plugins/wimax/wimax_compact_ulmap_ie_decoder.h
new file mode 100644
index 0000000000..f2c893d916
--- /dev/null
+++ b/plugins/wimax/wimax_compact_ulmap_ie_decoder.h
@@ -0,0 +1,34 @@
+/* wimax_compact_ulmap_ie_decoder.h
+ * WiMax HARQ Map Message decoder
+ *
+ * Copyright (c) 2007 by Intel Corporation.
+ *
+ * Author: Lu Pan <lu.pan@intel.com>
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1999 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef _WIMAX_COMPACT_ULMAP_IE_DECODER_H_
+#define _WIMAX_COMPACT_ULMAP_IE_DECODER_H_
+
+extern guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset);
+
+#endif /* _WIMAX_COMPACT_ULMAP_IE_DECODER_H_ */
diff --git a/plugins/wimax/wimax_harq_map_decoder.c b/plugins/wimax/wimax_harq_map_decoder.c
index c63b98c168..2f9c5b79c1 100644
--- a/plugins/wimax/wimax_harq_map_decoder.c
+++ b/plugins/wimax/wimax_harq_map_decoder.c
@@ -33,10 +33,8 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "crc.h"
-
-extern guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset);
-extern guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset);
-
+#include "wimax_compact_dlmap_ie_decoder.h"
+#include "wimax_compact_ulmap_ie_decoder.h"
 
 extern gint proto_wimax;