diff options
| author | joerg <joerg@pkgsrc.org> | 2012-04-22 20:31:29 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2012-04-22 20:31:29 +0000 |
| commit | fdc0f9aed8b9b11c8d160af8f61553cad31b50cd (patch) | |
| tree | 4e0c54995f6117024af84daf65116a8ede4eb3cd /textproc | |
| parent | ef5ee49b9fadbfb27f39e74a2a974bb7dccc061b (diff) | |
| download | pkgsrc-fdc0f9aed8b9b11c8d160af8f61553cad31b50cd.tar.gz | |
Don't use extern "C" when including C++ headers.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/cabocha/distinfo | 3 | ||||
| -rw-r--r-- | textproc/cabocha/patches/patch-src_cabocha.h | 32 |
2 files changed, 34 insertions, 1 deletions
diff --git a/textproc/cabocha/distinfo b/textproc/cabocha/distinfo index 18df1058a9c..d8f1c3ebf69 100644 --- a/textproc/cabocha/distinfo +++ b/textproc/cabocha/distinfo @@ -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 --git a/textproc/cabocha/patches/patch-src_cabocha.h b/textproc/cabocha/patches/patch-src_cabocha.h new file mode 100644 index 00000000000..dd7c30a909c --- /dev/null +++ b/textproc/cabocha/patches/patch-src_cabocha.h @@ -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; |