[pkgsrc/trunk]: pkgsrc/devel/ucommon Don't create multiple extern entries for...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/630a299e94db
branches:  trunk
changeset: 621628:630a299e94db
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Jul 13 19:22:27 2013 +0000

description:
Don't create multiple extern entries for the same inlined function.

diffstat:

 devel/ucommon/distinfo                           |   3 ++-
 devel/ucommon/patches/patch-inc_ucommon_string.h |  22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

diffs (39 lines):

diff -r 9318398711ee -r 630a299e94db devel/ucommon/distinfo
--- a/devel/ucommon/distinfo    Sat Jul 13 19:21:33 2013 +0000
+++ b/devel/ucommon/distinfo    Sat Jul 13 19:22:27 2013 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2013/06/27 01:36:25 rodent Exp $
+$NetBSD: distinfo,v 1.4 2013/07/13 19:22:27 joerg Exp $
 
 SHA1 (ucommon-6.0.5.tar.gz) = 661d5aa1a164826cf41bc6512c1eb1451a396be1
 RMD160 (ucommon-6.0.5.tar.gz) = 73b1b1fa35320a71718bf5367c273aac7f98076d
 Size (ucommon-6.0.5.tar.gz) = 806904 bytes
 SHA1 (patch-CMakeLists.txt) = 4d4c11a89111161bc8d8fe3715f643290ecb6149
 SHA1 (patch-commoncpp_address.cpp) = 13fc4a7073b6c2de6329a90269045fc3dbb0e389
+SHA1 (patch-inc_ucommon_string.h) = e878aefcf3a6e0b21eecdcef1f561c7f68c7a6c5
diff -r 9318398711ee -r 630a299e94db devel/ucommon/patches/patch-inc_ucommon_string.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ucommon/patches/patch-inc_ucommon_string.h  Sat Jul 13 19:22:27 2013 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-inc_ucommon_string.h,v 1.1 2013/07/13 19:22:27 joerg Exp $
+
+--- inc/ucommon/string.h.orig  2013-07-12 14:12:23.000000000 +0000
++++ inc/ucommon/string.h
+@@ -1627,7 +1627,7 @@ public:
+  * @param string2 to compare.
+  * @return 0 if equal, > 0 if s2 > s1, < 0 if s2 < s1.
+  */
+-extern "C" inline int stricmp(const char *string1, const char *string2)
++inline int stricmp(const char *string1, const char *string2)
+     {return String::case_compare(string1, string2);}
+ 
+ /**
+@@ -1637,7 +1637,7 @@ extern "C" inline int stricmp(const char
+  * @param max size of string to compare.
+  * @return 0 if equal, > 0 if s2 > s1, < 0 if s2 < s1.
+  */
+-extern "C" inline int strnicmp(const char *string1, const char *string2, size_t max)
++inline int strnicmp(const char *string1, const char *string2, size_t max)
+     {return String::case_compare(string1, string2, max);}
+ 
+ #endif