[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] tests: Import items from liba1 for MSVC.
From: |
Peter Rosin |
Subject: |
[PATCH] tests: Import items from liba1 for MSVC. |
Date: |
Sun, 19 Sep 2010 16:05:06 +0200 |
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.8) Gecko/20100802 Thunderbird/3.1.2 |
Hi!
tests/lt_dlexit.at turned out to be trival to fix for MSVC.
Ok to push? No rush for the release though, it's only the
testsuite...
Cheers,
Peter
>From f05840852938b904ac81502f7162e19525206f59 Mon Sep 17 00:00:00 2001
From: Peter Rosin <address@hidden>
Date: Sun, 19 Sep 2010 14:14:21 +0200
Subject: [PATCH] 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>
---
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
--
1.7.1
- [PATCH] tests: Import items from liba1 for MSVC.,
Peter Rosin <=