From 64f40a2816de1dcb2e064d961fc0ac4e3c52d551 Mon Sep 17 00:00:00 2001 From: David Cole Date: Wed, 1 Aug 2007 16:15:54 -0400 Subject: [PATCH] BUG: Fix test that broke on Windows - sharing sources between SHARED and STATIC libraries requires correct export and import decorations in the source code... --- Tests/Framework/bar.cxx | 7 +------ Tests/Framework/foo.cxx | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Tests/Framework/bar.cxx b/Tests/Framework/bar.cxx index c8ddc0ae0..37c132a0f 100644 --- a/Tests/Framework/bar.cxx +++ b/Tests/Framework/bar.cxx @@ -1,9 +1,4 @@ -#ifdef _WIN32 -# define CM_TEST_LIB_IMPORT __declspec( dllimport ) -#else -# define CM_TEST_LIB_IMPORT -#endif -CM_TEST_LIB_IMPORT void foo(); +void foo(); int main() { foo(); diff --git a/Tests/Framework/foo.cxx b/Tests/Framework/foo.cxx index 69808881c..b249ce348 100644 --- a/Tests/Framework/foo.cxx +++ b/Tests/Framework/foo.cxx @@ -1,5 +1,5 @@ #include -#ifdef _WIN32 +#if defined(_WIN32) && defined(foo_EXPORTS) # define CM_TEST_LIB_EXPORT __declspec( dllexport ) #else # define CM_TEST_LIB_EXPORT