X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2aef89b7a675805b601e757492c982031f38d21..d29d303b1c37d64c0e6b5638d793a2e425644419:/include/wx/log.h

diff --git a/include/wx/log.h b/include/wx/log.h
index bad161e60f..c70ab1a09b 100644
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -42,7 +42,7 @@ enum
 #define wxTraceResAlloc 0x0004  // trace GDI resource allocation
 #define wxTraceRefCount 0x0008  // trace various ref counting operations
 
-#ifdef  __WINDOWS__
+#ifdef  __WXMSW__
   #define wxTraceOleCalls 0x0100  // OLE interface calls
 #endif
 
@@ -294,8 +294,10 @@ void WXDLLEXPORT wxLogSysError(long lErrCode, wxTString strFormat, ...);
   extern void WXDLLEXPORT wxLogTrace(wxTraceMask mask,
                                      const char *szFormat, ...);
 #else   //!debug
-  #define wxLogDebug
-  #define wxLogTrace
+  // these functions do nothing
+  inline void wxLogDebug(const char *, ...) { }
+  inline void wxLogTrace(const char *, ...) { }
+  inline void wxLogTrace(wxTraceMask, const char *, ...) { }
 #endif
 
 
@@ -328,8 +330,8 @@ const char* WXDLLEXPORT wxSysErrorMsg(unsigned long nErrCode = 0);
                                rc, wxSysErrorMsg(rc))
   #define wxLogLastError(api) wxLogApiError(api, wxSysErrorCode())
 #else   //!debug
-  #define wxLogApiError(api, rc)
-  #define wxLogLastError(api)
+  inline void wxLogApiError(const char *, long) { }
+  inline void wxLogLastError(const char *) { }
 #endif  //debug/!debug
 
 #endif  //__LOGH__