diff options
| author | joerg <joerg> | 2011-08-20 15:30:36 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2011-08-20 15:30:36 +0000 |
| commit | c971ee15d87b7a44cfa501edcc2319761df5b5ef (patch) | |
| tree | e8144c466ac07ffb766d08af71ade4ddb72b4a56 /emulators | |
| parent | f02938a535a017d414ad89a27fb40b1f41596fc2 (diff) | |
| download | pkgsrc-c971ee15d87b7a44cfa501edcc2319761df5b5ef.tar.gz | |
Fix inline misuse breaking clang build
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/BasiliskII/distinfo | 4 | ||||
| -rw-r--r-- | emulators/BasiliskII/patches/patch-src-slirp-misc.c | 22 | ||||
| -rw-r--r-- | emulators/BasiliskII/patches/patch-src-slirp-slirp.h | 15 |
3 files changed, 40 insertions, 1 deletions
diff --git a/emulators/BasiliskII/distinfo b/emulators/BasiliskII/distinfo index a19d9fe623a..429bb39ac85 100644 --- a/emulators/BasiliskII/distinfo +++ b/emulators/BasiliskII/distinfo @@ -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 diff --git a/emulators/BasiliskII/patches/patch-src-slirp-misc.c b/emulators/BasiliskII/patches/patch-src-slirp-misc.c new file mode 100644 index 00000000000..c23785b090c --- /dev/null +++ b/emulators/BasiliskII/patches/patch-src-slirp-misc.c @@ -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; + { diff --git a/emulators/BasiliskII/patches/patch-src-slirp-slirp.h b/emulators/BasiliskII/patches/patch-src-slirp-slirp.h new file mode 100644 index 00000000000..e3218dcfc74 --- /dev/null +++ b/emulators/BasiliskII/patches/patch-src-slirp-slirp.h @@ -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 |