Wed Jan 25 14:46:16 2017 UTC ()

- don't use their ntoh{l,s}/hton{l,s} implementation
- fix their ntohl/htonl implementations to use unsigned int instead of
  unsigned long so they work on _LP64.


(christos)

diff -r1.1.1.1 -r1.2 src/external/bsd/tcpdump/dist/netdissect-stdinc.h

--- src/external/bsd/tcpdump/dist/netdissect-stdinc.h 2017/01/24 21:33:38	1.1.1.1
+++ src/external/bsd/tcpdump/dist/netdissect-stdinc.h 2017/01/25 14:46:16	1.2

 @@ -269,41 +269,41 @@ typedef char* caddr_t;
   #define FOPEN_WRITE_BIN  FOPEN_WRITE_TXT
 #endif
 /*
  * Inline x86 assembler-language versions of ntoh[ls]() and hton[ls](),
  * defined if the OS doesn't provide them.  These assume no more than
  * an 80386, so, for example, it avoids the bswap instruction added in
  * the 80486.
+ *
  * (We don't use them on OS X; Apple provides their own, which *doesn't*
  * avoid the bswap instruction, as OS X only supports machines that
  * have it.)
  */
-#if defined(__GNUC__) && defined(__i386__) && !defined(__APPLE__) && !defined(__ntohl)
+#if defined(__GNUC__) && defined(__i386__) && !defined(__APPLE__) && !defined(__ntohl) && !defined(ntohl)
   #undef ntohl
   #undef ntohs
   #undef htonl
   #undef htons
-  static __inline__ unsigned long __ntohl (unsigned long x);
+  static __inline__ unsigned int __ntohl (unsigned int x);
   static __inline__ unsigned short __ntohs (unsigned short x);
   #define ntohl(x)  __ntohl(x)
   #define ntohs(x)  __ntohs(x)
   #define htonl(x)  __ntohl(x)
   #define htons(x)  __ntohs(x)
-  static __inline__ unsigned long __ntohl (unsigned long x)
+  static __inline__ unsigned int __ntohl (unsigned int x)
+  {
     __asm__ ("xchgb %b0, %h0\n\t"   /* swap lower bytes  */
              "rorl  $16, %0\n\t"    /* swap words        */
              "xchgb %b0, %h0"       /* swap higher bytes */
             : "=q" (x) : "0" (x));
     return (x);
+  }
   static __inline__ unsigned short __ntohs (unsigned short x)
+  {
     __asm__ ("xchgb %b0, %h0"       /* swap bytes */
             : "=q" (x) : "0" (x));
     return (x);