Fix inline misuse breaking clang build

This commit is contained in:
joerg 2011-08-20 15:30:36 +00:00
parent 4646df4cb6
commit e24aeb73ba
3 changed files with 40 additions and 1 deletions

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.15 2007/06/12 12:51:07 joerg Exp $
$NetBSD: distinfo,v 1.16 2011/08/20 15:30:36 joerg Exp $
SHA1 (BasiliskII_src_01052006.tar.bz2) = 6373b33adf6caec53c5d1ed46a00adcac89ad3bb
RMD160 (BasiliskII_src_01052006.tar.bz2) = bb1a061c504bd7d28b869e0eec2806cf8a79cf8d
@ -14,3 +14,5 @@ SHA1 (patch-ah) = 0f67eed6f59e6c381c1a6fbeb98261cad4697760
SHA1 (patch-ai) = fc527be478576f157bffbd6a91eb1bdc85903fb1
SHA1 (patch-aj) = c331aa7080b330cf58f58c72456b91b0e5a2156f
SHA1 (patch-ak) = 1dad263b22ae3257a6e34b90972ba264ada7b287
SHA1 (patch-src-slirp-misc.c) = c9209ae4f3b142a506d42d296ed854974ec47117
SHA1 (patch-src-slirp-slirp.h) = c0c93d01e5b8d5182ddeed87b1434a7b113175e0

View file

@ -0,0 +1,22 @@
$NetBSD: patch-src-slirp-misc.c,v 1.1 2011/08/20 15:30:36 joerg Exp $
--- src/slirp/misc.c.orig 2011-08-20 13:13:50.000000000 +0000
+++ src/slirp/misc.c
@@ -106,7 +106,7 @@ struct quehead_32 {
u_int32_t qh_rlink;
};
-inline void
+void
insque_32(a, b)
void *a;
void *b;
@@ -120,7 +120,7 @@ insque_32(a, b)
= (u_int32_t)element;
}
-inline void
+void
remque_32(a)
void *a;
{

View file

@ -0,0 +1,15 @@
$NetBSD: patch-src-slirp-slirp.h,v 1.1 2011/08/20 15:30:36 joerg Exp $
--- src/slirp/slirp.h.orig 2011-08-20 13:13:12.000000000 +0000
+++ src/slirp/slirp.h
@@ -288,8 +288,8 @@ extern int do_echo;
# define insque_32 insque
# define remque_32 remque
#else
- inline void insque_32 _P((void *, void *));
- inline void remque_32 _P((void *));
+ void insque_32 _P((void *, void *));
+ void remque_32 _P((void *));
#endif
#ifndef _WIN32