[SCM] GNU Libtool branch, master, updated. v2.2.10-61-g653fa66

[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  653fa66d07f238fa9a3a337d3f8a72d95583d3c4 (commit)
      from  0656b19eb95ce33ea8be5927ec7ebb0f9a8d0b52 (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 653fa66d07f238fa9a3a337d3f8a72d95583d3c4
Author: Peter Rosin <address@hidden>
Date:   Sat Jul 17 04:05:33 2010 +0200

    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.

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

Summary of changes:
 ChangeLog           |    6 ++++++
 tests/link-order.at |   22 ++++++++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a20add4..5c425b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-17  Peter Rosin  <address@hidden>
+
+       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  <address@hidden>
            Ralf Wildenhues  <address@hidden>
 
diff --git a/tests/link-order.at b/tests/link-order.at
index 0122a45..05ce776 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
 


hooks/post-receive
-- 
GNU Libtool