Module Name: src
Committed By: plunky
Date: Sat Apr 10 08:33:35 UTC 2010
Modified Files:
src/dist/tcpdump: tcpdump-stdinc.h
Log Message:
use static __inline__ as per latest upstream, fixes problem with
C99 vs GNUC semantics of extern __inline__
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/dist/tcpdump/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/dist/tcpdump/tcpdump-stdinc.h
diff -u src/dist/tcpdump/tcpdump-stdinc.h:1.2 src/dist/tcpdump/tcpdump-stdinc.h:1.3
--- src/dist/tcpdump/tcpdump-stdinc.h:1.2 Tue Jul 24 11:53:50 2007
+++ src/dist/tcpdump/tcpdump-stdinc.h Sat Apr 10 08:33:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tcpdump-stdinc.h,v 1.2 2007/07/24 11:53:50 drochner Exp $ */
+/* $NetBSD: tcpdump-stdinc.h,v 1.3 2010/04/10 08:33:35 plunky Exp $ */
/*
* Copyright (c) 2002 - 2003
@@ -151,15 +151,15 @@
#undef htonl
#undef htons
- extern __inline__ unsigned long __ntohl (unsigned long x);
- extern __inline__ unsigned short __ntohs (unsigned short x);
+ 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)
- extern __inline__ unsigned long __ntohl (unsigned long 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 */
@@ -168,7 +168,7 @@
return (x);
}
- extern __inline__ unsigned short __ntohs (unsigned short x)
+ static __inline__ unsigned short __ntohs (unsigned short x)
{
__asm__ ("xchgb %b0, %h0" /* swap bytes */
: "=q" (x) : "0" (x));
