[SCM] GNU Libtool branch, master, updated. v2.2.10-202-g48c28ce

[Peter Rosin]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  48c28ce65b53af7ad6c1cb84026e47be9ce2d68b (commit)
       via  52972128c5952da628e033e4509208711906c3a2 (commit)
      from  f05840852938b904ac81502f7162e19525206f59 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 48c28ce65b53af7ad6c1cb84026e47be9ce2d68b
Author: Peter Rosin <address@hidden>
Date:   Mon Sep 20 09:11:43 2010 +0200

    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 <address@hidden>

commit 52972128c5952da628e033e4509208711906c3a2
Author: Peter Rosin <address@hidden>
Date:   Mon Sep 20 09:07:25 2010 +0200

    tests: __declspec (dll{ex,im}port) in tests/exceptions.at
    
    * tests/exceptions.at (common.h, module.h, lib.h) [w32]: Use
    __declspec (dllimport) and __declspec (dllexport) instead of
    the less portable __attribute__ ((dllimport)) and
    __attribute__ ((dllexport)).  Makes the test compile on MSVC.
    
    Signed-off-by: Peter Rosin <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog           |   17 +++++++++++++++++
 libltdl/ltdl.h      |    9 +++++----
 tests/exceptions.at |   17 ++++++++---------
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 78d3e48..8ed47f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2010-09-20  Peter Rosin  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       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  <address@hidden>
+
+       tests: __declspec (dll{ex,im}port) in tests/exceptions.at
+       * tests/exceptions.at (common.h, module.h, lib.h) [w32]: Use
+       __declspec (dllimport) and __declspec (dllexport) instead of
+       the less portable __attribute__ ((dllimport)) and
+       __attribute__ ((dllexport)).  Makes the test compile on MSVC.
+
 2010-09-19  Peter Rosin  <address@hidden>
 
        tests: Import items from liba1 for MSVC.
diff --git a/libltdl/ltdl.h b/libltdl/ltdl.h
index 5154da1..749a54d 100644
--- 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)
 
 
 
diff --git a/tests/exceptions.at b/tests/exceptions.at
index 235597c..286b2ac 100644
--- a/tests/exceptions.at
+++ b/tests/exceptions.at
@@ -66,9 +66,8 @@ CPPFLAGS="$LTDLINCL $CPPFLAGS"
 # the regex).  However, in this test, none of these situations apply,
 # so we don't directly address it.  Otherwise, the correct mechanism
 # would be to avoid all of those flags, and instead explicitly decorate
-# all symbols with appropriate __attribute__ ((dllexport)) or
-# __attribute__ ((dllimport)) flags when building the DLLs and the
-# clients.
+# all symbols with appropriate __declspec (dllexport) or
+# __declspec (dllimport) flags when building the DLLs and the clients.
 #
 # For more information, see these two threads:
 #   http://lists.gnu.org/archive/html/bug-libtool/2010-06/msg00069.html
@@ -84,9 +83,9 @@ AT_DATA([common.h],
 #if defined(__CYGWIN__) || defined(_WIN32)
 # if defined(DLL_EXPORT) || defined(USING_COMMON_DLL)
 #  if defined(LIBTOOL_TEST_IN_COMMON)
-#   define COMMON_IMPEXP __attribute__ ((dllexport))
+#   define COMMON_IMPEXP __declspec (dllexport)
 #  else
-#   define COMMON_IMPEXP __attribute__ ((dllimport))
+#   define COMMON_IMPEXP __declspec (dllimport)
 #  endif
 # else
 #  define COMMON_IMPEXP
@@ -128,9 +127,9 @@ AT_DATA([module.h],
 #if defined(__CYGWIN__) || defined(_WIN32)
 # if defined(DLL_EXPORT) || defined(USING_MODULE_DLL)
 #  if defined(LIBTOOL_TEST_IN_MODULE)
-#   define MODULE_IMPEXP __attribute__ ((dllexport))
+#   define MODULE_IMPEXP __declspec (dllexport)
 #  else
-#   define MODULE_IMPEXP __attribute__ ((dllimport))
+#   define MODULE_IMPEXP __declspec (dllimport)
 #  endif
 # else
 #  define MODULE_IMPEXP
@@ -174,9 +173,9 @@ AT_DATA([lib.h],
 #if defined(__CYGWIN__) || defined(_WIN32)
 # if defined(DLL_EXPORT) || defined(USING_LIB_DLL)
 #  if defined(LIBTOOL_TEST_IN_LIB)
-#   define LIB_IMPEXP __attribute__ ((dllexport))
+#   define LIB_IMPEXP __declspec (dllexport)
 #  else
-#   define LIB_IMPEXP __attribute__ ((dllimport))
+#   define LIB_IMPEXP __declspec (dllimport)
 #  endif
 # else
 #  define LIB_IMPEXP


hooks/post-receive
-- 
GNU Libtool