aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2010-09-10 11:27:26 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2010-09-10 11:27:26 +0200
commita36aa0976dbbd2dd104c6a1738e90f31d6ed2917 (patch)
tree65aab864c18076f3a4737501ecc3020063f6ccc7
parent81ac8f1ff70adb0b7a1e4625dcf237bcec83b2a4 (diff)
Fix incorrect preprocessor test for when to include DllMain
-rw-r--r--odb/details/win32/dll.cxx4
1 files changed, 3 insertions, 1 deletions
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