From: Peter Rosin <peda@lysator.liu.se>
Date: Sun, 19 Sep 2010 12:14:21 +0000 (+0200)
Subject: tests: Import items from liba1 for MSVC.
X-Git-Tag: v2.4~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f05840852938b904ac81502f7162e19525206f59;p=thirdparty%2Flibtool.git

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 <peda@lysator.liu.se>
---

diff --git a/ChangeLog b/ChangeLog
index 946f8d704..78d3e4876 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-19  Peter Rosin  <peda@lysator.liu.se>
+
+	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  <Ralf.Wildenhues@gmx.de>
 
 	tests: avoid distcheck failure with --disable-ltdl-install.
diff --git a/tests/lt_dlexit.at b/tests/lt_dlexit.at
index 8d0b7282c..c80c1ebab 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