From: Peter Rosin <peda@lysator.liu.se>
Date: Sat, 17 Jul 2010 02:05:33 +0000 (+0200)
Subject: dllimport the variable for MSVC in link-order.at
X-Git-Tag: v2.4~108
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=653fa66d07f238fa9a3a337d3f8a72d95583d3c4;p=thirdparty%2Flibtool.git

dllimport the variable for MSVC in link-order.at

* tests/link-order.at [MSVC]: Makes the test pass by dllimporting
imported variables when working with shared libraries.
---

diff --git a/ChangeLog b/ChangeLog
index a20add4cc..5c425b765 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-17  Peter Rosin  <peda@lysator.liu.se>
+
+	dllimport the variable for MSVC in link-order.at
+	* tests/link-order.at [MSVC]: Makes the test pass by dllimporting
+	imported variables when working with shared libraries.
+
 2010-07-08  Peter Rosin  <peda@lysator.liu.se>
 	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
diff --git a/tests/link-order.at b/tests/link-order.at
index 0122a45e9..05ce776a2 100644
--- a/tests/link-order.at
+++ b/tests/link-order.at
@@ -48,13 +48,31 @@ for i in old new; do
   mkdir src
 
   cat >src/a_$i.c <<EOF
-extern int c;
+/* w32 fun, MSVC needs to dllimport when using a shared library, so use
+ * DLL_EXPORT to discriminate as that happens to coinside in this case.
+ * gnu has auto import.
+ */
+#if defined _MSC_VER && defined DLL_EXPORT
+#  define LIBCEE_SCOPE __declspec(dllimport)
+#else
+#  define LIBCEE_SCOPE extern
+#endif
+LIBCEE_SCOPE int c;
 extern int b_$i();
 int a_$i() { return c + b_$i(); }
 EOF
 
   cat >src/b_$i.c <<EOF
-extern int c;
+/* w32 fun, MSVC needs to dllimport when using a shared library, so use
+ * DLL_EXPORT to discriminate as that happens to coinside in this case.
+ * gnu has auto import.
+ */
+#if defined _MSC_VER && defined DLL_EXPORT
+#  define LIBCEE_SCOPE __declspec(dllimport)
+#else
+#  define LIBCEE_SCOPE extern
+#endif
+LIBCEE_SCOPE int c;
 int b_$i() { return 1 + c; }
 EOF