X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbf1f0e5cffb8c01696eb26e254857a61f017d70..26ac5fadeaa4081fb0e19909d6152f75c64090bb:/src/msw/ole/oleutils.cpp

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index 39165f2aac..efec456070 100644
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -41,7 +41,7 @@
 #include  <wx/msw/ole/uuid.h>
 #include  <wx/msw/ole/oleutils.h>
 
-#ifndef __BORLANDC__
+#if defined(_MSC_VER) && (_MSC_VER > 1000)
 #include  <docobj.h>
 #endif
 
@@ -64,8 +64,7 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
 // Debug support
 // ----------------------------------------------------------------------------
 
-#ifdef  __DEBUG__
-
+#if defined(__WXDEBUG__) && defined(_MSC_VER) && (_MSC_VER > 1000)
 const char *GetIidName(REFIID riid)
 {
   // an association between symbolic name and numeric value of an IID
@@ -160,7 +159,7 @@ const char *GetIidName(REFIID riid)
   #undef ADD_KNOWN_IID
 
   // try to find the interface in the table
-  for ( uint ui = 0; ui < WXSIZEOF(aKnownIids); ui++ ) {
+  for ( size_t ui = 0; ui < WXSIZEOF(aKnownIids); ui++ ) {
     if ( riid == *aKnownIids[ui].pIid ) {
       return aKnownIids[ui].szName;
     }
@@ -187,7 +186,7 @@ void wxLogRelease(const char *szInterface, ULONG cRef)
   wxLogTrace("After %s::Release: m_cRef = %d", szInterface, cRef - 1);
 }
 
-#endif  //DEBUG
+#endif  //WXDEBUG
 
 #endif
   // USE_DRAG_AND_DROP