diff --git a/include/wx/datetime.h b/include/wx/datetime.h
index 35a164dd3a..9ea0f924b6 100644
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -36,7 +36,7 @@ class WXDLLEXPORT wxDateSpan;
 // rebuilt)
 
 // For Mingw32, causes a link error. (VZ: why?)
-#if defined( __WXDEBUG__) && !defined(__MINGW32__)
+#if defined( __WXDEBUG__) && !defined(__MINGW32__) && !defined(_MSC_VER)
     #define wxDATETIME_DONT_INLINE
 
     #undef inline
diff --git a/include/wx/datetime.inl b/include/wx/datetime.inl
index 398b02828b..17a8c36f37 100644
--- a/include/wx/datetime.inl
+++ b/include/wx/datetime.inl
@@ -36,7 +36,7 @@
 // ----------------------------------------------------------------------------
 
 // only define this once, when included from datetime.cpp
-#ifdef wxDEFINE_TIME_CONSTANTS
+#if 1 // def wxDEFINE_TIME_CONSTANTS
     const long wxDateTime::TIME_T_FACTOR = 1000l;
 #endif // wxDEFINE_TIME_CONSTANTS