32,33c32
< * $FreeBSD: head/contrib/tcpdump/tcpdump-stdinc.h 190207 2009-03-21 18:30:25Z rpaulo $
< * @(#) $Header: /tcpdump/master/tcpdump/tcpdump-stdinc.h,v 1.17 2006-05-19 17:55:34 hannes Exp $ (LBL)
---
> * @(#) $Header: /tcpdump/master/tcpdump/tcpdump-stdinc.h,v 1.18 2007-11-24 18:13:33 mcr Exp $ (LBL)
58a58,61
> #ifndef NBBY
> #define NBBY 8
> #endif
>
146a150,180
> #if defined(__GNUC__) && defined(__i386__) && !defined(__ntohl)
> #undef ntohl
> #undef ntohs
> #undef htonl
> #undef htons
>
> static __inline__ unsigned long __ntohl (unsigned long 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)
> {
> __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);
> }
> #endif
>