compilation fix after last change

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 2c8e1c5a1246384ed9e27f6bd8cbb5c29a6cce9f..ba72a4d4fad3e7d9d41466d99b92ffd9907b097b 100644 (file)
--- 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
     // 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
         #define HAVE_TEMPLATE_OVERLOAD_RESOLUTION

-    #endif
-#endif // __BORLANDC__
-
+    #endif // __BORLANDC__

 #endif // !defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION)
 
 /*  ---------------------------------------------------------------------------- */
 #endif // !defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION)
 
 /*  ---------------------------------------------------------------------------- */

diff --git a/include/wx/msw/wince/libraries.h b/include/wx/msw/wince/libraries.h
index fb3699064333d4a4af2a1fc8d8b11de689be6f98..efda4d697bd39bee4562141e814d4a7cec38dce3 100644 (file)
--- 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
 
 // 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
 
     #pragma comment(lib,"ccrtrtti.lib")
 #endif