From 4506b3385f59442f862ffc012b99de86f72b1255 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sat, 7 Jan 2012 03:27:03 +0100 Subject: [PATCH] Use static inline instead of extern inline to fix DEBUG build. Fixing this directly even though it is technically vendor code as it has been modified rather heavily (as per #8252). --- src/bin/network/tcpdump/tcpdump-stdinc.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/network/tcpdump/tcpdump-stdinc.h b/src/bin/network/tcpdump/tcpdump-stdinc.h index 9bef506704..4f3f4ea18d 100644 --- a/src/bin/network/tcpdump/tcpdump-stdinc.h +++ b/src/bin/network/tcpdump/tcpdump-stdinc.h @@ -150,15 +150,15 @@ typedef char* caddr_t; #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 */ @@ -167,7 +167,7 @@ typedef char* caddr_t; 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));