[SCM] GNU Libtool branch, master, updated. v2.2.10-200-gf058408

[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  f05840852938b904ac81502f7162e19525206f59 (commit)
      from  3ce570843e0f83e0c7d4b331945e7aff98ad6878 (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 f05840852938b904ac81502f7162e19525206f59
Author: Peter Rosin <address@hidden>
Date:   Sun Sep 19 14:14:21 2010 +0200

    tests: Import items from liba1 for MSVC.
    
    * tests/lt_dlexit.at (b1.c) [MSVC]: Import function f1 and
    variable v1 from liba1 when using them from modb1.  Makes the
    test pass on MSVC.
    
    Signed-off-by: Peter Rosin <address@hidden>

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

Summary of changes:
 ChangeLog          |    7 +++++++
 tests/lt_dlexit.at |   11 +++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 946f8d7..78d3e48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-19  Peter Rosin  <address@hidden>
+
+       tests: Import items from liba1 for MSVC.
+       * tests/lt_dlexit.at (b1.c) [MSVC]: Import function f1 and
+       variable v1 from liba1 when using them from modb1.  Makes the
+       test pass on MSVC.
+
 2010-09-18  Ralf Wildenhues  <address@hidden>
 
        tests: avoid distcheck failure with --disable-ltdl-install.
diff --git a/tests/lt_dlexit.at b/tests/lt_dlexit.at
index 8d0b728..c80c1eb 100644
--- a/tests/lt_dlexit.at
+++ b/tests/lt_dlexit.at
@@ -1,6 +1,6 @@
 # lt_dlexit.at -- test libltdl functionality                  -*- Autotest -*-
 #
-#   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2007, 2008, 2010 Free Software Foundation, Inc.
 #   Written by Dave Brolley & Ralf Wildenhues, 2007
 #
 #   This file is part of GNU Libtool.
@@ -117,7 +117,14 @@ AT_DATA([b1.c],
 [[#ifdef __cplusplus
 extern "C" {
 #endif
-extern int f1 (int), v1;
+#if defined DLL_EXPORT && defined _WIN32 && defined _MSC_VER
+#  define LIBA1_SCOPE extern __declspec (dllimport)
+#endif
+#if !defined LIBA1_SCOPE
+#  define LIBA1_SCOPE extern
+#endif
+LIBA1_SCOPE int f1 (int);
+LIBA1_SCOPE v1;
 int fb1 (int x) { return f1 (v1) + x - 3; }
 int vb1 = 3;
 #ifdef __cplusplus


hooks/post-receive
-- 
GNU Libtool