Craig Rodrigues' fixes to let it compile on AIX using IBM's compiler

(remove commas following the last member of an enum, make all bit fields
"guint32" - GCC lets you get away with that, but at least some other
compilers don't).

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

diff --git a/packet-ipv6.h b/packet-ipv6.h
index 6bcfc925e9ab8475f777d90d2487cf5b7649a719..2ca75968ee9d66dc9c405f4b9488c0fc8966c438 100644 (file)
--- a/packet-ipv6.h
+++ b/packet-ipv6.h
@@ -1,7 +1,7 @@
 /* packet-ipv6.h
  * Definitions for IPv6 packet disassembly 
  *
- * $Id: packet-ipv6.h,v 1.8 1999/11/03 06:13:20 guy Exp $
+ * $Id: packet-ipv6.h,v 1.9 1999/11/18 01:45:05 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -417,12 +417,12 @@ struct icmp6_namelookup {
 struct icmp6_router_renum {    /* router renumbering header */
        struct icmp6_hdr        rr_hdr;
        guint8          rr_segnum;
-       guint8          rr_test : 1;
-       guint8          rr_reqresult : 1;
-       guint8          rr_forceapply : 1;
-       guint8          rr_specsite : 1;
-       guint8          rr_prevdone : 1;
-       guint8          rr_flags_reserved : 3;
+       guint32         rr_test : 1;
+       guint32         rr_reqresult : 1;
+       guint32         rr_forceapply : 1;
+       guint32         rr_specsite : 1;
+       guint32         rr_prevdone : 1;
+       guint32         rr_flags_reserved : 3;
        guint16         rr_maxdelay;
        guint32         rr_reserved;
 };
@@ -430,12 +430,12 @@ struct icmp6_router_renum {       /* router renumbering header */
 struct icmp6_router_renum {    /* router renumbering header */
        struct icmp6_hdr        rr_hdr;
        guint8          rr_segnum;
-       guint8          rr_flags_reserved : 3;
-       guint8          rr_prevdone : 1;
-       guint8          rr_specsite : 1;
-       guint8          rr_forceapply : 1;
-       guint8          rr_reqresult : 1;
-       guint8          rr_test : 1;
+       guint32         rr_flags_reserved : 3;
+       guint32         rr_prevdone : 1;
+       guint32         rr_specsite : 1;
+       guint32         rr_forceapply : 1;
+       guint32         rr_reqresult : 1;
+       guint32         rr_test : 1;
        guint16         rr_maxdelay;
        guint32         rr_reserved;
 };
@@ -466,12 +466,12 @@ struct rr_pco_match {             /* match prefix part */
 struct rr_pco_use {            /* use prefix part */
        guint8  rpu_uselen;
        guint8  rpu_keeplen;
-       guint8  rpu_mask_onlink : 1;
-       guint8  rpu_mask_autonomous : 1;
-       guint8  rpu_mask_reserved : 6;
-       guint8  rpu_onlink : 1;
-       guint8  rpu_autonomous : 1;
-       guint8  rpu_raflags_reserved : 6;
+       guint32 rpu_mask_onlink : 1;
+       guint32 rpu_mask_autonomous : 1;
+       guint32 rpu_mask_reserved : 6;
+       guint32 rpu_onlink : 1;
+       guint32 rpu_autonomous : 1;
+       guint32 rpu_raflags_reserved : 6;
        guint32 rpu_vltime;
        guint32 rpu_pltime;
        guint32 rpu_decr_vltime : 1;
@@ -484,12 +484,12 @@ struct rr_pco_use {               /* use prefix part */
 struct rr_pco_use {            /* use prefix part */
        guint8  rpu_uselen;
        guint8  rpu_keeplen;
-       guint8  rpu_mask_reserved : 6;
-       guint8  rpu_mask_autonomous : 1;
-       guint8  rpu_mask_onlink : 1;
-       guint8  rpu_raflags_reserved : 6;
-       guint8  rpu_autonomous : 1;
-       guint8  rpu_onlink : 1;
+       guint32 rpu_mask_reserved : 6;
+       guint32 rpu_mask_autonomous : 1;
+       guint32 rpu_mask_onlink : 1;
+       guint32 rpu_raflags_reserved : 6;
+       guint32 rpu_autonomous : 1;
+       guint32 rpu_onlink : 1;
        guint32 rpu_vltime;
        guint32 rpu_pltime;
        guint32 rpu_flags_reserved : 6;
@@ -503,9 +503,9 @@ struct rr_pco_use {         /* use prefix part */
 #if BYTE_ORDER == BIG_ENDIAN /* net byte order */
 struct rr_result {             /* router renumbering result message */
        guint8  rrr_reserved;
-       guint8  rrr_flags_reserved : 6;
-       guint8  rrr_outofbound : 1;
-       guint8  rrr_forbidden : 1;
+       guint32 rrr_flags_reserved : 6;
+       guint32 rrr_outofbound : 1;
+       guint32 rrr_forbidden : 1;
        guint8  rrr_ordinal;
        guint8  rrr_matchedlen;
        guint32 rrr_ifid;
@@ -514,9 +514,9 @@ struct rr_result {          /* router renumbering result message */
 #elif BYTE_ORDER == LITTLE_ENDIAN
 struct rr_result {             /* router renumbering result message */
        guint8  rrr_reserved;
-       guint8  rrr_forbidden : 1;
-       guint8  rrr_outofbound : 1;
-       guint8  rrr_flags_reserved : 6;
+       guint32 rrr_forbidden : 1;
+       guint32 rrr_outofbound : 1;
+       guint32 rrr_flags_reserved : 6;
        guint8  rrr_ordinal;
        guint8  rrr_matchedlen;
        guint32 rrr_ifid;

diff --git a/packet-ncp.c b/packet-ncp.c
index d45bc70d318500277dc8bd0cc11633a36aefab6a..98a9a4fa479b58b4df3dd5eef3320da5902e8880 100644 (file)
--- a/packet-ncp.c
+++ b/packet-ncp.c
@@ -2,7 +2,7 @@
  * Routines for NetWare Core Protocol
  * Gilbert Ramirez <gram@verdict.uthscsa.edu>
  *
- * $Id: packet-ncp.c,v 1.22 1999/11/17 21:58:28 guy Exp $
+ * $Id: packet-ncp.c,v 1.23 1999/11/18 01:45:02 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@unicom.net>
@@ -158,7 +158,7 @@ enum nfamily {
                NCP_QUEUE_SERVICES,             /* print queues */
                NCP_FILE_SERVICES,              /* file serving */
                NCP_BINDERY_SERVICES,   /* bindery database */
-               NCP_CONNECTION_SERVICES, /* communication */
+               NCP_CONNECTION_SERVICES /* communication */
 };
 
 /* I had to put this function prototype after the enum nfamily declaration */

diff --git a/packet-rsvp.h b/packet-rsvp.h
index 80d4739673d3898e411e7d603c1e0e4b7d59c212..fea398bc74f6c1e5a344e5481f3b6be41a63cbb3 100644 (file)
--- a/packet-rsvp.h
+++ b/packet-rsvp.h
@@ -4,7 +4,7 @@
  *
  * (C) Ashok Narayanan <ashokn@cisco.com>
  *
- * $Id: packet-rsvp.h,v 1.6 1999/08/27 20:10:14 guy Exp $
+ * $Id: packet-rsvp.h,v 1.7 1999/11/18 01:45:02 guy Exp $
  *
  * For license details, see the COPYING file with this distribution
  *
@@ -53,7 +53,7 @@ enum rsvp_classes {
     RSVP_CLASS_SENDER_TSPEC,
     RSVP_CLASS_ADSPEC,
     RSVP_CLASS_POLICY,
-    RSVP_CLASS_CONFIRM,
+    RSVP_CLASS_CONFIRM
 };
 
 static value_string rsvp_class_vals[] = { 
@@ -297,7 +297,7 @@ enum    qos_service_type {
     QOS_QUALITATIVE =     128,          /* Qualitative service */
     QOS_CONTROLLED_LOAD=    5,         /* Controlled Load Service */
     QOS_GUARANTEED =        2,         /* Guaranteed service */
-    QOS_TSPEC =             1,         /* Traffic specification */
+    QOS_TSPEC =             1          /* Traffic specification */
     };
 
 static value_string qos_vals[] = {
@@ -319,7 +319,7 @@ enum intsrv_services {
        INTSRV_GENERAL = 1,
        INTSRV_GTD = 2,
        INTSRV_CLOAD = 5,
-       INTSRV_QUALITATIVE = 128,
+       INTSRV_QUALITATIVE = 128
 };
 
 static value_string intsrv_services_str[] = { 

diff --git a/packet-smb.c b/packet-smb.c
index 67cf394c9673a91aaa0133ea3e5379e605132fb2..969d171774aaf641ea515ef12882cd32d8d3e1c7 100644 (file)
--- a/packet-smb.c
+++ b/packet-smb.c
@@ -2,7 +2,7 @@
  * Routines for smb packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: packet-smb.c,v 1.41 1999/11/17 21:58:28 guy Exp $
+ * $Id: packet-smb.c,v 1.42 1999/11/18 01:45:03 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@unicom.net>
@@ -9934,6 +9934,7 @@ dissect_mailslot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *p
       break;
 
     default:
+      break;
     }
 
     return 1;  /* Success */