From a36aa0976dbbd2dd104c6a1738e90f31d6ed2917 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 10 Sep 2010 11:27:26 +0200
Subject: Fix incorrect preprocessor test for when to include DllMain

---
 odb/details/win32/dll.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'odb/details')

diff --git a/odb/details/win32/dll.cxx b/odb/details/win32/dll.cxx
index c802380..e8741fc 100644
--- a/odb/details/win32/dll.cxx
+++ b/odb/details/win32/dll.cxx
@@ -6,7 +6,9 @@
 // If we are building a static library from VC++ (LIBODB_STATIC_LIB) or
 // a static library from automake (!DLL_EXPORT), then omit DllMain.
 //
-#if defined(LIBODB_STATIC_LIB) || !defined (_MSC_VER) && !defined(DLL_EXPORT)
+
+#if (defined(_MSC_VER) && defined(LIBODB_DYNAMIC_LIB)) || \
+    (!defined(_MSC_VER) && defined(DLL_EXPORT))
 
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
-- 
cgit v1.1