* tests/loadlibrary.at: Fix C++ issues.

Signed-off-by: Peter Rosin <peda@lysator.liu.se>

diff --git a/ChangeLog b/ChangeLog
index 9dce6a8276af47381e595c6271caf8193892c805..d7af1836a4addf1ce2008f917661efbbeaa538e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-29  Peter Rosin  <peda@lysator.liu.se>
+
+       * tests/loadlibrary.at: Fix C++ issues.
+
 2010-01-20  Peter Rosin  <peda@lysator.liu.se>
 
        Report proper errors from the loadlibrary loader.

diff --git a/tests/loadlibrary.at b/tests/loadlibrary.at
index 8315a5d78af9df0972b029caa14362790b75cb60..30ebd3a4921fae08aeda25537e84b33ff4bcf755 100644 (file)
--- a/tests/loadlibrary.at
+++ b/tests/loadlibrary.at
@@ -54,8 +54,8 @@ main (int argc, char* argv[])
   lt_dlhandle module = NULL;
   const lt_dlvtable *loadlibrary;
   const lt_dlvtable *preopen;
-  lt_dlloader *loader = NULL;
-  lt_dlloader *next;
+  lt_dlloader loader = NULL;
+  lt_dlloader next;
   const lt_dlvtable *vtable;
   void *symbol;
   const char *error;
@@ -168,6 +168,9 @@ cleanup:
 
 AT_DATA([foomod.c],
 [[
+#ifdef __cplusplus
+extern "C"
+#endif
 int foosym (void);
 int
 foosym (void)
@@ -178,6 +181,9 @@ foosym (void)
 
 AT_DATA([bardep.c],
 [[
+#ifdef __cplusplus
+extern "C"
+#endif
 int bardep (void);
 int
 bardep (void)
@@ -188,8 +194,14 @@ bardep (void)
 
 AT_DATA([barmod.c],
 [[
+#ifdef __cplusplus
+extern "C" {
+#endif
 int bardep (void);
 int barsym (void);
+#ifdef __cplusplus
+}
+#endif
 int
 barsym (void)
 {