diff options
| author | chuck <chuck@pkgsrc.org> | 2008-11-18 17:57:38 +0000 |
|---|---|---|
| committer | chuck <chuck@pkgsrc.org> | 2008-11-18 17:57:38 +0000 |
| commit | 639d0db5933a8a68d16f3981650f7bd69ee0ef23 (patch) | |
| tree | 1df2b9cf7b13c111ccfcd207dc1ebb91bcfdd81f /devel | |
| parent | 3bbc51a10949aec1811ac6f0c7dc9fd9c307c87a (diff) | |
| download | pkgsrc-639d0db5933a8a68d16f3981650f7bd69ee0ef23.tar.gz | |
do not use "extern inline", use "static inline" instead, as suggested
by joerg. see discussion here:
http://mail-index.netbsd.org/tech-toolchain/2008/11/17/msg000501.html
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/glib/distinfo | 4 | ||||
| -rw-r--r-- | devel/glib/patches/patch-aj | 19 |
2 files changed, 15 insertions, 8 deletions
diff --git a/devel/glib/distinfo b/devel/glib/distinfo index 61894e59f80..944e32ddaed 100644 --- a/devel/glib/distinfo +++ b/devel/glib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2006/07/11 09:35:13 rillig Exp $ +$NetBSD: distinfo,v 1.20 2008/11/18 17:57:38 chuck Exp $ SHA1 (glib-1.2.10.tar.gz) = e5a9361c594608d152d5d9650154c2e3260b87fa RMD160 (glib-1.2.10.tar.gz) = f19efe8c87ebeea979a4d36902d8a8209640cd95 @@ -12,4 +12,4 @@ SHA1 (patch-af) = 3e3caa294cc64dd13beb61f327f647c2ba0ca6f7 SHA1 (patch-ag) = efdff0d20a1c3280c9916405a8d89190c68b9604 SHA1 (patch-ah) = 1e6dec25db0c72601868bb0f7c465202ecead81b SHA1 (patch-ai) = 6f6e5727bcb52655865b689c923601843d8d453d -SHA1 (patch-aj) = 25cdacb4742589533f37113dcbb50ba7c6dd45bc +SHA1 (patch-aj) = c705a7a8bdf88f1f50af579d0e3c729a6b0ac24e diff --git a/devel/glib/patches/patch-aj b/devel/glib/patches/patch-aj index 3bea6312973..f89eb18f685 100644 --- a/devel/glib/patches/patch-aj +++ b/devel/glib/patches/patch-aj @@ -1,8 +1,6 @@ -$NetBSD: patch-aj,v 1.2 2006/01/12 19:49:15 joerg Exp $ - ---- glib.h.orig 2001-02-27 03:44:38.000000000 +0000 -+++ glib.h -@@ -119,8 +119,12 @@ extern "C" { +--- glib.h.orig 2001-02-26 22:44:38.000000000 -0500 ++++ glib.h 2008-11-18 12:51:35.000000000 -0500 +@@ -119,8 +119,12 @@ * defined then the current definition is correct. */ #ifndef NULL @@ -15,7 +13,16 @@ $NetBSD: patch-aj,v 1.2 2006/01/12 19:49:15 joerg Exp $ #ifndef FALSE #define FALSE (0) -@@ -271,14 +275,18 @@ extern "C" { +@@ -204,7 +208,7 @@ + #ifndef G_INLINE_FUNC + # ifdef __GNUC__ + # ifdef __OPTIMIZE__ +-# define G_INLINE_FUNC extern inline ++# define G_INLINE_FUNC static inline + # else + # undef G_CAN_INLINE + # define G_INLINE_FUNC extern +@@ -271,14 +275,18 @@ /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with * macros, so we can refer to them as strings unconditionally. |