libltdl: Make sure preloaded symbols are declared extern "C".

* libltdl/ltdl.h (LTDL_SET_PRELOADED_SYMBOLS): Move the
declaration of lt__PROGRAM__LTX_preloaded_symbols to global
scope and make sure it has "C" linkage.  Makes exceptions.at
succeed on MSVC.

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

diff --git a/ChangeLog b/ChangeLog
index 3c72890a70d2e446c018c414bc80824f3ea24222..8ed47f77f778949dee05563f2230ff2ddccfcdaf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-20  Peter Rosin  <peda@lysator.liu.se>
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       libltdl: Make sure preloaded symbols are declared extern "C".
+       * libltdl/ltdl.h (LTDL_SET_PRELOADED_SYMBOLS): Move the
+       declaration of lt__PROGRAM__LTX_preloaded_symbols to global
+       scope and make sure it has "C" linkage.  Makes exceptions.at
+       succeed on MSVC.
+
 2010-09-20  Peter Rosin  <peda@lysator.liu.se>
 
        tests: __declspec (dll{ex,im}port) in tests/exceptions.at

diff --git a/libltdl/ltdl.h b/libltdl/ltdl.h
index 5154da1aa83f5ecd10b5f2b139981fd5c526ee1e..749a54d682bac9d4ba5fd8702c583ce1196698b9 100644 (file)
--- a/libltdl/ltdl.h
+++ b/libltdl/ltdl.h
@@ -102,10 +102,11 @@ LT_SCOPE int      lt_dlpreload_open    (const char *originator,
                                      lt_dlpreload_callback_func *func);
 
 #define lt_preloaded_symbols   lt__PROGRAM__LTX_preloaded_symbols
-#define LTDL_SET_PRELOADED_SYMBOLS()                   LT_STMT_START{  \
-       extern LT_DLSYM_CONST lt_dlsymlist lt_preloaded_symbols[];      \
-       lt_dlpreload_default(lt_preloaded_symbols);                     \
-                                                       }LT_STMT_END
+/* Ensure C linkage.  */
+extern LT_DLSYM_CONST lt_dlsymlist lt__PROGRAM__LTX_preloaded_symbols[];
+
+#define LTDL_SET_PRELOADED_SYMBOLS() \
+       lt_dlpreload_default(lt_preloaded_symbols)