From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 29 Nov 2009 22:03:14 +0000 (+0100)
Subject: Fix bindir and dlopen tests for C++ compilers (CC=g++).
X-Git-Tag: v2.2.7b~42
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b15f6f9ded3e9e1edb7b74e5bd823cd511673e48;p=thirdparty%2Flibtool.git

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 3f19b9013..3ba536cbb 100644
--- 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 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 <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 3d148a9fc..ca5bdfa31 100644
--- 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)
 {