From b15f6f9ded3e9e1edb7b74e5bd823cd511673e48 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 29 Nov 2009 23:03:14 +0100 Subject: [PATCH] Fix bindir and dlopen tests for C++ compilers (CC=g++). * tests/bindir.at (bindir basic lib test, bindir install tests): Include stdlib.h rather than declaring abort. * tests/lt_dlopenext.at (lt_dlopenext error messages): Use `extern "C"' annotation for dlsym'ed function in C++ mode. Signed-off-by: Ralf Wildenhues --- ChangeLog | 8 ++++++++ tests/bindir.at | 4 ++-- tests/lt_dlopenext.at | 3 +++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f19b9013..3ba536cbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-11-29 Ralf Wildenhues + + Fix bindir and dlopen tests for C++ compilers (CC=g++). + * tests/bindir.at (bindir basic lib test, bindir install tests): + Include stdlib.h rather than declaring abort. + * tests/lt_dlopenext.at (lt_dlopenext error messages): Use + `extern "C"' annotation for dlsym'ed function in C++ mode. + 2009-11-25 Peter Rosin Fix cross build issue in execute mode test. diff --git a/tests/bindir.at b/tests/bindir.at index 859b1c4b4..e49853da2 100644 --- a/tests/bindir.at +++ b/tests/bindir.at @@ -128,9 +128,9 @@ int bar (void) { return y + baz ();} ]]) AT_DATA([main.c],[[ +#include extern int baz (void); extern int bar (void); -extern void abort (void); int main() { if (baz () + bar () - 25) abort (); return 0; @@ -237,9 +237,9 @@ int bar (void) { return y + baz ();} ]]) AT_DATA([main.c],[[ +#include extern int baz (void); extern int bar (void); -extern void abort (void); int main() { if (baz () + bar () - 25) abort (); return 0; diff --git a/tests/lt_dlopenext.at b/tests/lt_dlopenext.at index 3d148a9fc..ca5bdfa31 100644 --- a/tests/lt_dlopenext.at +++ b/tests/lt_dlopenext.at @@ -41,6 +41,9 @@ AT_DATA([simple-module.c], [[ #include +#ifdef __cplusplus +extern "C" +#endif int run (const char *argument) { -- 2.47.2