VC++ 6 doesn't seem to like the uninlining thing and

also the wxDateTime::TIME_T_FACTOR must be always defined;
else we get link errors. I don't know why these didn't
turn up before...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/datetime.h b/include/wx/datetime.h
index 35a164dd3a5bed502e6999d38d1eea1262574663..9ea0f924b6e82bf9cc23aadebef3049580ed7356 100644 (file)
--- 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 398b02828b0e3841d5b3343aa71bc50cfb62c2dc..17a8c36f37efccbf6b4dce4df79b119d7e210259 100644 (file)
--- 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