From 7f09ea0290c4155c8484485d5df150d2eb7de042 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 6 Nov 2006 12:52:22 +0000 Subject: [PATCH] Define functions without C++ name mangling. --- gettext-runtime/intl/ChangeLog | 4 ++++ gettext-runtime/intl/plural-exp.h | 9 +++++++++ gettext-tools/src/ChangeLog | 4 ++++ gettext-tools/src/plural-eval.h | 8 ++++++++ 4 files changed, 25 insertions(+) diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 2a72b00af..a210edccb 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,7 @@ +2006-10-30 Bruno Haible + + * plural-exp.h [C++]: Define functions without name mangling. + 2006-11-03 Bruno Haible Move declarations to header files. diff --git a/gettext-runtime/intl/plural-exp.h b/gettext-runtime/intl/plural-exp.h index d062dd1df..b0992b986 100644 --- a/gettext-runtime/intl/plural-exp.h +++ b/gettext-runtime/intl/plural-exp.h @@ -28,6 +28,10 @@ # define attribute_hidden #endif +#ifdef __cplusplus +extern "C" { +#endif + enum expression_operator { @@ -117,4 +121,9 @@ extern unsigned long int plural_eval (struct expression *pexp, unsigned long int n); #endif + +#ifdef __cplusplus +} +#endif + #endif /* _PLURAL_EXP_H */ diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index cee10c08c..537ecab8a 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,7 @@ +2006-10-30 Bruno Haible + + * plural-eval.h [C++]: Define functions without name mangling. + 2006-10-29 Bruno Haible Clean up libgettextpo exports in C++ mode. diff --git a/gettext-tools/src/plural-eval.h b/gettext-tools/src/plural-eval.h index 7acba2512..031fe4df8 100644 --- a/gettext-tools/src/plural-eval.h +++ b/gettext-tools/src/plural-eval.h @@ -43,6 +43,10 @@ # define USE_SIGINFO 1 #endif +#ifdef __cplusplus +extern "C" { +#endif + /* Exit point. Must be set before calling install_sigfpe_handler(). */ extern sigjmp_buf sigfpe_exit; @@ -56,5 +60,9 @@ extern int sigfpe_code; extern void install_sigfpe_handler (void); extern void uninstall_sigfpe_handler (void); +#ifdef __cplusplus +} +#endif + #endif /* _PLURAL_EVAL_H */ -- 2.47.3