From 57b486583d6809c9f4cf58286bb5b150a6415449 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sat, 15 Feb 2003 17:14:19 +0000 Subject: [PATCH] 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 --- include/wx/datetime.h | 2 +- include/wx/datetime.inl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 -- 2.45.2