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
This commit is contained in:
Julian Smart
2003-02-15 17:14:19 +00:00
parent e56aba8dd5
commit 57b486583d
2 changed files with 2 additions and 2 deletions

View File

@@ -36,7 +36,7 @@ class WXDLLEXPORT wxDateSpan;
// rebuilt) // rebuilt)
// For Mingw32, causes a link error. (VZ: why?) // 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 #define wxDATETIME_DONT_INLINE
#undef inline #undef inline

View File

@@ -36,7 +36,7 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// only define this once, when included from datetime.cpp // 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; const long wxDateTime::TIME_T_FACTOR = 1000l;
#endif // wxDEFINE_TIME_CONSTANTS #endif // wxDEFINE_TIME_CONSTANTS