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 <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 3f19b9013ce2bfeeecaa35348cb7df5385df1a35..3ba536cbb3e2bb4609b1f4925bf52979b5281b1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       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  <peda@lysator.liu.se>
 
        Fix cross build issue in execute mode test.

diff --git a/tests/bindir.at b/tests/bindir.at
index 859b1c4b4aa234eab92501f6a8d40def42ab84af..e49853da2a342753d56d274a3349fd5778a766bd 100644 (file)
--- a/tests/bindir.at
+++ b/tests/bindir.at
@@ -128,9 +128,9 @@ int bar (void) { return y + baz ();}
 ]])
 
 AT_DATA([main.c],[[
+#include <stdlib.h>
 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 <stdlib.h>
 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 3d148a9fc5139a0a0e59b0a51fcef35ccf29f4fc..ca5bdfa31059ac523deb308702edcff96de9a75b 100644 (file)
--- a/tests/lt_dlopenext.at
+++ b/tests/lt_dlopenext.at
@@ -41,6 +41,9 @@ AT_DATA([simple-module.c],
 [[
 #include <stdio.h>
 
+#ifdef __cplusplus
+extern "C"
+#endif
 int
 run (const char *argument)
 {