From 18caa1e963269d02499b327bb4e7cc2ac48fd67e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 28 Feb 2008 00:22:02 +0000 Subject: [PATCH] compilation fix after last change git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 6 ++---- include/wx/msw/wince/libraries.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 2c8e1c5a12..ba72a4d4fa 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -477,11 +477,9 @@ typedef short int WXTYPE; // assume the compiler can use type or const expressions as template // arguments if it supports partial specialization -- except if it's a // Borland one which can't - #ifdef HAVE_PARTIAL_SPECIALIZATION && !defined(__BORLANDC__) + #if defined(HAVE_PARTIAL_SPECIALIZATION) && !defined(__BORLANDC__) #define HAVE_TEMPLATE_OVERLOAD_RESOLUTION - #endif -#endif // __BORLANDC__ - + #endif // __BORLANDC__ #endif // !defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION) /* ---------------------------------------------------------------------------- */ diff --git a/include/wx/msw/wince/libraries.h b/include/wx/msw/wince/libraries.h index fb36990643..efda4d697b 100644 --- a/include/wx/msw/wince/libraries.h +++ b/include/wx/msw/wince/libraries.h @@ -32,7 +32,7 @@ // this library is only available for PocketPC targets using recent SDK and is // needed for RTTI support -#if (_WIN32_WCE >= 400) && !defined(__WINCE_NET__) !defined(wxNO_RTTI) +#if (_WIN32_WCE >= 400) && !defined(__WINCE_NET__) && !defined(wxNO_RTTI) #pragma comment(lib,"ccrtrtti.lib") #endif -- 2.45.2