* libltdl/ltdl.c: The linker is confused by having one

definition of lt_libltdlc_LTX_preloaded_symbols tagged with
__declspec(dllexport) in ltdl.c and one definition with an
initial value in libltdlcS.c. So, just say extern in ltdl.c.
Fixes the mdemo-exec.test for MinGW.

diff --git a/ChangeLog b/ChangeLog
index 6fbaf36299e21e5b1081317a5f106d1a7a45a08c..ffe8624d8684bc551b1a42d8740eb3f93e1cad46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-28  Peter Ekberg  <peda@lysator.liu.se>
+
+       * libltdl/ltdl.c: The linker is confused by having one
+       definition of lt_libltdlc_LTX_preloaded_symbols tagged with
+       __declspec(dllexport) in ltdl.c and one definition with an
+       initial value in libltdlcS.c. So, just say extern in ltdl.c.
+       Fixes the mdemo-exec.test for MinGW.
+
 2005-07-28  Peter Ekberg  <peda@lysator.liu.se>
 
        * config/ltmain.m4sh (func_mode_link) <lib>: Zap duplicate

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index d07013e7625f0f88b8b015324fee724c1d342f8d..3221a6d35acd524e0d3391c573806209e29ba566 100644 (file)
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -190,7 +190,7 @@ loader_init (lt_get_vtable *vtable_func, lt_user_data data)
 
 LT_SCOPE const lt_dlvtable *   get_vtable (lt_user_data data);
 #ifdef HAVE_LIBDLLOADER
-LT_SCOPE lt_dlsymlist          preloaded_symbols;
+extern lt_dlsymlist            preloaded_symbols;
 #endif
 
 /* Initialize libltdl. */