Watcom/Digital Mars patches

["Gisle Vanem" <giva () bgnett no>]

I've compiled tcpdump okay with these compilers and some
small changes.

Digital Mars doesn't allow conversion between unsigned
and signed without a cast. So this is needed:

--- tcpdump-2004.11.02/print-802_11.c Thu Sep 23 23:57:25 2004
+++ ./print-802_11.c Fri Oct 29 14:48:11 2004
@@ -964,7 +964,7 @@
  rc = cpack_uint8(s, &u.u8);
  break;
 case IEEE80211_RADIOTAP_DBM_TX_POWER:
-  rc = cpack_uint8(s, &u.i8);
+  rc = cpack_int8(s, &u.i8);
  break;
 case IEEE80211_RADIOTAP_TSFT:
  rc = cpack_uint64(s, &u.u64);

Watcom doesn't have sys/time.h and I can't see why it's 
needed (it's already in tcpdump-stdinc.h).

--- tcpdump-2004.11.02/netdissect.h Thu Jul 22 00:00:10 2004
+++ ./netdissect.h Tue Nov 02 17:35:46 2004
@@ -31,7 +31,6 @@
#include "os-proto.h"
#endif
#include <sys/types.h>
-#include <sys/time.h>

#ifndef HAVE___ATTRIBUTE__
#define __attribute__(x)

Alternatively add HAVE_SYS_TIME_H and update autoconf.
Some other items:

--- tcpdump-2004.11.02/print-isakmp.c Thu Mar 25 05:31:05 2004
+++ ./print-isakmp.c Fri Oct 29 14:52:28 2004
@@ -1201,7 +1201,7 @@
   * XXX - what if item_len is too short, or too long,
   * for this payload type?
   */
-  cp = (*NPFUNC(np))(ext, item_len, ep, phase, doi, proto, depth);
+  cp = (*npfunc[np])(ext, item_len, ep, phase, doi, proto, depth);
 } else {
  printf("%s", NPSTR(np));
  cp += item_len;
--- tcpdump-2004.11.02/print-snmp.c Tue Mar 23 08:59:15 2004
+++ ./print-snmp.c Wed Mar 24 18:05:11 2004
@@ -77,6 +77,8 @@
#include "interface.h"
#include "addrtoname.h"

+#undef OPAQUE  /* defined in <wingdi.h> */
+
/*
 * Universal ASN.1 types
 * (we only care about the tag values for those allowed in the Internet SMI)
@@ -949,6 +951,8 @@
    case SMI_BASETYPE_UNKNOWN:
 ok = 1;
 break;
+    default:
+ ok = 0;
    }

    return ok;

--gv


-
This is the tcpdump-workers list.
Visit https://lists.sandelman.ca/ to unsubscribe.