[pkgsrc/trunk]: pkgsrc/devel/glib do not use "extern inline", use "static inl...

[chuck <chuck%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/882428a9827d
branches:  trunk
changeset: 550304:882428a9827d
user:      chuck <chuck%pkgsrc.org@localhost>
date:      Tue Nov 18 17:57:38 2008 +0000

description:
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:

 devel/glib/distinfo         |   4 ++--
 devel/glib/patches/patch-aj |  19 +++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diffs (48 lines):

diff -r 82024420cf59 -r 882428a9827d devel/glib/distinfo
--- a/devel/glib/distinfo       Tue Nov 18 17:52:06 2008 +0000
+++ b/devel/glib/distinfo       Tue Nov 18 17:57:38 2008 +0000
@@ -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-ag) = efdff0d20a1c3280c9916405a8d89190c68b9604
 SHA1 (patch-ah) = 1e6dec25db0c72601868bb0f7c465202ecead81b
 SHA1 (patch-ai) = 6f6e5727bcb52655865b689c923601843d8d453d
-SHA1 (patch-aj) = 25cdacb4742589533f37113dcbb50ba7c6dd45bc
+SHA1 (patch-aj) = c705a7a8bdf88f1f50af579d0e3c729a6b0ac24e
diff -r 82024420cf59 -r 882428a9827d devel/glib/patches/patch-aj
--- a/devel/glib/patches/patch-aj       Tue Nov 18 17:52:06 2008 +0000
+++ b/devel/glib/patches/patch-aj       Tue Nov 18 17:57:38 2008 +0000
@@ -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 @@
  
  #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.