i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use static inline instead of extern inline to fix DEBUG build.

Browse Source 
Fixing this directly even though it is technically vendor code as it
has been modified rather heavily (as per #8252).
This commit is contained in:
Michael Lotz
2012-01-07 03:27:03 +01:00
parent d26f88068b
commit 4506b3385f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/network/tcpdump/tcpdump-stdinc.h
+4 -4
View File
@@ -150,15 +150,15 @@ typedef char* caddr_t;
#undef htonl #undef htonl
#undef htons #undef htons
extern __inline__ unsigned long __ntohl (unsigned long x); static __inline__ unsigned long __ntohl (unsigned long x);
extern __inline__ unsigned short __ntohs (unsigned short x); static __inline__ unsigned short __ntohs (unsigned short x);
#define ntohl(x) __ntohl(x) #define ntohl(x) __ntohl(x)
#define ntohs(x) __ntohs(x) #define ntohs(x) __ntohs(x)
#define htonl(x) __ntohl(x) #define htonl(x) __ntohl(x)
#define htons(x) __ntohs(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 */ __asm__ ("xchgb %b0, %h0\n\t" /* swap lower bytes */
"rorl $16, %0\n\t" /* swap words */ "rorl $16, %0\n\t" /* swap words */
@@ -167,7 +167,7 @@ typedef char* caddr_t;
return (x); return (x);
} }
extern __inline__ unsigned short __ntohs (unsigned short x) static __inline__ unsigned short __ntohs (unsigned short x)
{ {
__asm__ ("xchgb %b0, %h0" /* swap bytes */ __asm__ ("xchgb %b0, %h0" /* swap bytes */
: "=q" (x) : "0" (x)); : "=q" (x) : "0" (x));