[pkgsrc/trunk]: pkgsrc/textproc/cabocha Don't use extern "C" when including C...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/183f8109e14d
branches:  trunk
changeset: 602928:183f8109e14d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Apr 22 20:31:29 2012 +0000

description:
Don't use extern "C" when including C++ headers.

diffstat:

 textproc/cabocha/distinfo                    |   3 +-
 textproc/cabocha/patches/patch-src_cabocha.h |  32 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletions(-)

diffs (50 lines):

diff -r 56f7978f55fd -r 183f8109e14d textproc/cabocha/distinfo
--- a/textproc/cabocha/distinfo Sun Apr 22 20:30:43 2012 +0000
+++ b/textproc/cabocha/distinfo Sun Apr 22 20:31:29 2012 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2011/04/14 11:40:39 obache Exp $
+$NetBSD: distinfo,v 1.4 2012/04/22 20:31:29 joerg Exp $
 
 SHA1 (cabocha-0.53.tar.gz) = 6b8903aa6843887bb669d9d5baea8a0eae320d80
 RMD160 (cabocha-0.53.tar.gz) = 39b637adc8b882542ecc3b6df34d8f6b99be3e38
 Size (cabocha-0.53.tar.gz) = 11552551 bytes
 SHA1 (patch-aa) = cb868fa8b88180ed5f84d55796d042e5774862af
 SHA1 (patch-ab) = 3dcaae627c12a8ffc3595177768445335c5a3bd4
+SHA1 (patch-src_cabocha.h) = 85bbf0da32677b7d4a33f1ef8d9aa7915fa1da1f
 SHA1 (patch-src_common.h) = 33a84611497ff0d98a6d9d9abaf0cd3ff60c3a83
diff -r 56f7978f55fd -r 183f8109e14d textproc/cabocha/patches/patch-src_cabocha.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/cabocha/patches/patch-src_cabocha.h      Sun Apr 22 20:31:29 2012 +0000
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_cabocha.h,v 1.1 2012/04/22 20:31:30 joerg Exp $
+
+Do not include C++ headers in a extern "C" block.
+
+--- src/cabocha.h.orig 2012-04-20 16:25:56.000000000 +0000
++++ src/cabocha.h
+@@ -24,12 +24,6 @@
+ #ifndef _CABOCHA_CABOCHA_H
+ #define _CABOCHA_CABOCHA_H
+ 
+-#ifdef __cplusplus
+-
+-/* for C */
+-extern "C" {
+-#endif
+-
+ #ifdef _WIN32
+ #  ifdef DLL_EXPORT
+ #    define CABOCHA_DLL_EXTERN    __declspec(dllexport)
+@@ -50,6 +44,12 @@ extern "C" {
+ #include <string.h>
+ #endif
+ 
++#ifdef __cplusplus
++
++/* for C */
++extern "C" {
++#endif
++
+   typedef struct _cabocha_t cabocha_t;
+ 
+   typedef void cabocha_tree_t;