[haiku-commits] haiku: hrev43637 - src/bin/network/tcpdump
- From: mmlr@xxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 7 Jan 2012 03:29:46 +0100 (CET)
hrev43637 adds 1 changeset to branch 'master'
old head: d26f88068bd4d5757935ac27893fb572b19e0568
new head: 4506b3385f59442f862ffc012b99de86f72b1255
----------------------------------------------------------------------------
4506b33: 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).
[ Michael Lotz <mmlr@xxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev43637
Commit: 4506b3385f59442f862ffc012b99de86f72b1255
URL: http://cgit.haiku-os.org/haiku/commit/?id=4506b33
Author: Michael Lotz <mmlr@xxxxxxxx>
Date: Sat Jan 7 02:27:03 2012 UTC
Ticket: https://dev.haiku-os.org/ticket/8252
----------------------------------------------------------------------------
1 files changed, 4 insertions(+), 4 deletions(-)
src/bin/network/tcpdump/tcpdump-stdinc.h | 8 ++++----
----------------------------------------------------------------------------
diff --git a/src/bin/network/tcpdump/tcpdump-stdinc.h
b/src/bin/network/tcpdump/tcpdump-stdinc.h
index 9bef506..4f3f4ea 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));
Other related posts:
- » [haiku-commits] haiku: hrev43637 - src/bin/network/tcpdump - mmlr
