Module Name: src
Committed By: christos
Date: Thu Nov 20 04:51:18 UTC 2014
Modified Files:
src/external/bsd/tcpdump/dist: tcpdump-stdinc.h
Log Message:
l in ntohl is not long!
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/tcpdump/dist/tcpdump-stdinc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tcpdump/dist/tcpdump-stdinc.h
diff -u src/external/bsd/tcpdump/dist/tcpdump-stdinc.h:1.1.1.4 src/external/bsd/tcpdump/dist/tcpdump-stdinc.h:1.2
--- src/external/bsd/tcpdump/dist/tcpdump-stdinc.h:1.1.1.4 Wed Nov 19 20:30:53 2014
+++ src/external/bsd/tcpdump/dist/tcpdump-stdinc.h Wed Nov 19 23:51:18 2014
@@ -259,7 +259,7 @@ typedef char* caddr_t;
#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)
@@ -267,7 +267,7 @@ typedef char* caddr_t;
#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 */
