fix compile errors found by dumpabi target
authorrbalint <rbalint@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 19 Jan 2012 22:55:37 +0000 (22:55 +0000)
committerrbalint <rbalint@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 19 Jan 2012 22:55:37 +0000 (22:55 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40595 f5534014-38df-0310-8fa8-9805f1628bb7

20 files changed:
asn1/acse/packet-acse-template.h
asn1/idmp/packet-idmp-template.h
epan/Makefile.am
epan/crypt/airpdcap_int.h
epan/dissectors/packet-alcap.h
epan/dissectors/packet-fc.h
epan/dissectors/packet-fix.c
epan/dissectors/packet-fix.h
epan/dissectors/packet-iax2.h
epan/dissectors/packet-ses.h
epan/dissectors/packet-xmpp-conference.h
epan/dissectors/packet-xmpp-core.h
epan/dissectors/packet-xmpp-gtalk.h
epan/dissectors/packet-xmpp-jingle.h
epan/dissectors/packet-xmpp-other.h
epan/dissectors/rpc_defrag.h
epan/reassemble.h
fix/README
fix/Values.xsl
wsutil/Makefile.am

index 2c81eff7e71aebb98725a96e750a73b554ca445f..3f81b8fcfdc41cfdf00aea5e8c7a5336c12ddd90 100644 (file)
@@ -26,6 +26,7 @@
 #ifndef PACKET_ACSE_H
 #define PACKET_ACSE_H
 
+#include <epan/asn1.h>
 #include "packet-acse-exp.h"
 
 #endif  /* PACKET_ACSE_H */
index 7798ed23d32f4865ec774b2add69764f7d8da8f6..a8a19d1b54049dc1eaced925ab0e10b8641094c8 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef PACKET_IDM_H
 #define PACKET_IDM_H
 
+#include <packet-ros.h>
+
 void
 register_idmp_protocol_info(const char *oid, const ros_info_t *rinfo, int proto _U_, const char *name);
 
index edcf1a1722c8b6741aa4077eb3e9271060b60a36..ef204dd22ea7ddb56dd8a56e348133764f0f8973 100644 (file)
@@ -313,8 +313,13 @@ dumpabi: all abi-descriptor.xml
        mkdir abi-check-headers; cp ../color.h ../config.h ../register.h abi-check-headers/; \
        mkdir abi-check-headers/epan; cp *.h abi-check-headers/epan; \
        mkdir abi-check-headers/crypt; cp crypt/*.h abi-check-headers/crypt; \
-       mkdir abi-check-headers/dfilter; cp dfilter/*.h abi-check-headers/dfilter; \
+       mkdir abi-check-headers/dfilter; cp dfilter/*.h ../tools/lemon/cppmagic.h abi-check-headers/dfilter; \
        mkdir abi-check-headers/dissectors; cp dissectors/*.h abi-check-headers/dissectors; \
+       rm abi-check-headers/dissectors/x11-extension-implementation.h \
+       abi-check-headers/dissectors/packet-rtps2.h \
+       abi-check-headers/dissectors/x11-glx-render-enum.h \
+       abi-check-headers/dissectors/x11-register-info.h \
+       abi-check-headers/dissectors/packet-idmp.h; \
        mkdir abi-check-headers/ftypes; cp ftypes/*.h abi-check-headers/ftypes; \
        abi-compliance-checker -l libwireshark -v1 `ls  .libs/libwireshark.so.?.?.?|sed 's/.*\.so\.//'` \
                -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml && \
index e6c1b20a614bcd52748529baff1bb078af879359..14f1763ffce9a1b7eb1565cb9e70a4b1e10b96a9 100644 (file)
@@ -41,6 +41,7 @@
 /*     File includes                                                           */
 
 #include "airpdcap_interop.h"
+#include "airpdcap_system.h"
 
 /****************************************************************************/
 
index 2cc34ae7755e9d36678c04f169f863a57af892e9..cc14ff68c9327c7d99f0041b54af0286f3305a0a 100644 (file)
@@ -21,6 +21,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifndef PACKET_ALCAP_H
+#define PACKET_ALCAP_H
+
 #include <epan/dissectors/packet-e164.h>
 
 extern void alcap_tree_from_bearer_key(proto_tree* tree, tvbuff_t* tvb, const gchar* key);
@@ -57,3 +60,4 @@ typedef struct _alcap_message_info_t {
     guint release_cause;
 } alcap_message_info_t;
 
+#endif
index 8ff57135e3ceeeb4be6536340e4f49e112a06a55..7281b7a295a27ee567f96ad8cc0ed23a89b6977e 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef __PACKET_FC_H_
 #define __PACKET_FC_H_
 
+#include "packet-scsi.h"
+
 /* R_CTL upper bits creates a classification tree */
 #define FC_RCTL_DEV_DATA       0x00
 #define FC_RCTL_ELS            0x20
index 0b5fe19ad17d099a24cfff9172f033efd3c29a8d..e57070a69c2d182b58f578d7d0305e3e2aabeed3 100644 (file)
 
 #include "packet-tcp.h"
 
-typedef struct _fix_field {
-    int         tag;    /* FIX tag */
-    int         hf_id;
-    int         type;   /* */
-    const void *table;
-} fix_field;
-
 typedef struct _fix_parameter {
     int field_len;
     int tag_len;
index a3be42423658ed50ca0691d5c8e6133c45680ff7..c290777257847f3c35ce8ee90a7ab580cca036f3 100644 (file)
@@ -5,6 +5,12 @@
  *
  */
 
+typedef struct _fix_field {
+  int      tag;         /* FIX tag */
+  int      hf_id;
+  int      type;        /* */
+  const void *table;
+} fix_field;
 
    static const string_string messages_val[] = {
        { "0", "Heartbeat" },
index 2d99440dacdb595e910c05c386624082c32447aa..b1000c5f1fe6955cd829bd46f7e2cbad1b5696c5 100644 (file)
@@ -27,6 +27,8 @@
 #ifndef _PACKET_IAX2_H
 #define _PACKET_IAX2_H
 
+#include <tap-voip.h>
+
 /* Max version of IAX protocol we support */
 #define IAX_PROTO_VERSION      2
 
index be010c46976c95eb5e0365133934a74ce2d913bf..10b7cae79c9c21660ec82a355aedec12b4411da9 100644 (file)
@@ -25,6 +25,8 @@
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+#ifndef PACKET_SES_H
+#define PACKET_SES_H
 
 #define PROTO_STRING_SES "ISO 8327-1 OSI Session Protocol"
 #define PROTO_STRING_SES_INFO "ISO 8327-1 OSI Session Protocol."
@@ -207,3 +209,4 @@ struct SESSION_DATA_STRUCTURE
 
 extern const value_string ses_vals[];
 
+#endif
index 9972f7f4676daa8570226f9c0ffcdabf344e673e..30c5847842d89ccfcc7861c1384d0458c7a81f84 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef XMPP_CONFERENCE_H
 #define XMPP_CONFERENCE_H
 
+#include "packet-xmpp-utils.h"
+
 extern void xmpp_conferece_info_advert(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
 extern void xmpp_conference_info(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
 
index ee81443fd78038e2275226d8c89d326bec0085f7..1f36c385da08194ac717e4acb5b97fb8dafbc3b1 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef XMPP_CORE_H
 #define XMPP_CORE_H
 
+#include "packet-xmpp-utils.h"
+
 extern void xmpp_iq(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *packet);
 extern void xmpp_presence(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *packet);
 extern void xmpp_message(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *packet);
index cc708835b9ba1504a90bf611087da89d8575db84..af58e6aaf6e178895cfd7a049ba4cea6e10cf64a 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef XMPP_GTALK_H
 #define XMPP_GTALK_H
 
+#include "packet-xmpp-utils.h"
+
 extern void xmpp_gtalk_session(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
 extern void xmpp_gtalk_jingleinfo_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
 extern void xmpp_gtalk_usersetting(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
index 3edc872b25f2f35c4500cab971ae5cc7dbb8c5f0..076359ff23c09c5a9376db234c2783dc0f59af86 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef XMPP_JINGLE_H
 #define XMPP_JINGLE_H
 
+#include "packet-xmpp-utils.h"
+
 extern void xmpp_jingle(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
 extern void xmpp_jinglenodes_services(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
 extern void xmpp_jinglenodes_channel(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
index 0dbe96c3e18c27d0e3088f294216b457d77a3810..ad9eccfab30ed83113006af59357576c939ef60b 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef XMPP_OTHER_H
 #define XMPP_OTHER_H
 
+#include "packet-xmpp-utils.h"
+
 extern void xmpp_iq_bind(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
 extern void xmpp_session(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
 extern void xmpp_vcard(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
index 45052c22aa2e2e55b4d3e7920b60aca9b2deb648..7e67910327d28d873d4fc4533840ec16a42b2992 100644 (file)
@@ -25,6 +25,8 @@
 #ifndef __RPC_DEFRAG_H__
 #define __RPC_DEFRAG_H__
 
+#include "reassemble.h"
+
 /*
  * RPC-over-TCP fragmentation.
  */
index 12e93a199c4ae0a0302c04555043dbbf93b6b5f3..8d8f7cff7b4e54e5fab7d1415688791857aa2ba5 100644 (file)
@@ -26,6 +26,9 @@
  * the flags field of fd_head !!!
  */
 
+#ifndef REASSEMBLE_H
+#define REASSEMBLE_H
+
 /* only in fd_head: packet is defragmented */
 #define FD_DEFRAGMENTED                0x0001
 
@@ -314,3 +317,5 @@ show_fragment_tree(fragment_data *ipfd_head, const fragment_items *fit,
 extern gboolean
 show_fragment_seq_tree(fragment_data *ipfd_head, const fragment_items *fit,
     proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, proto_item **fi);
+
+#endif
index 14e93e1063ed8a7f6a311a73dae5dc1ef383ce89..f6a1e77b036820381fbbedf2ba44291482b22969 100644 (file)
@@ -18,3 +18,6 @@ xsltproc hfList.xsl FIX43.xml; xsltproc hfList.xsl FIX44.xml) > packet-fix.h
 NOTES:
 - fix_field structure should use 'since' and 'until' attributes for removed
 tags.
+
+TODO:
+ - make packet-fix.h autogenerated
index a47e63c2159b0de7cad4f2f6be3e7c94457ecdca..619cd9e54a9366f51ceea03343715b31532b8644 100644 (file)
@@ -13,6 +13,13 @@ Syntax: xsltproc Values.xsl FIX44.xml
  *
  */
 
+typedef struct _fix_field {
+  int      tag;         /* FIX tag */
+  int      hf_id;
+  int      type;        /* */
+  const void *table;
+} fix_field;
+
   <xsl:apply-templates/>
 
 </xsl:template>
index 8688c7376c5aa900b2e22b0b7183388e6b68cf0d..e959e42631711d17bf18aba4e6f3050cdfcaf4cd 100644 (file)
@@ -129,7 +129,7 @@ MAINTAINERCLEANFILES = \
 # Checked using version 1.21.12
 dumpabi: all abi-descriptor.xml
        rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz; \
-       mkdir abi-check-headers; cp *.h abi-check-headers/; \
+       mkdir abi-check-headers; cp ../config.h *.h abi-check-headers/; \
        abi-compliance-checker -l libwsutil -v1 `ls  .libs/libwsutil.so.?.?.?|sed 's/.*\.so\.//'` \
                -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml && \
        cp -f abi_dumps/libwsutil/libwsutil_* .libs/; \