X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2432b92dd7a837db13d3938a56c1959decd03203..b98d804b283dc391ef112f734393696eea0a4ee4:/include/wx/msw/private.h

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index bef4c75a13..dcf23526ab 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -111,7 +111,7 @@ VOID    WINAPI ibAdjustWindowRect( HWND hWnd, LPRECT lprc ) ;
  *
  */
 
-#if CTL3D
+#if wxUSE_CTL3D
 #include <wx/msw/ctl3d/ctl3d.h>
 #endif
 
@@ -182,11 +182,15 @@ inline bool wxStyleHasBorder(long style)
 #endif
 
 #if defined(__WIN95__) && defined(__WXDEBUG__) && wxUSE_DBWIN32
+
+#ifndef __TWIN32__
 #ifdef OutputDebugString
 #undef OutputDebugString
 #endif
 
 #define OutputDebugString OutputDebugStringW95
+#endif
+
 extern void OutputDebugStringW95(const char*, ...);
 #endif