X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/766aecab3a30f6038477943790bf34e0ab91e286..a721fd82b7ca8c97048453d4aaff559e8f741d69:/include/wx/log.h

diff --git a/include/wx/log.h b/include/wx/log.h
index 01d37ca61d..aa8a00e216 100644
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -378,7 +378,7 @@ class WXDLLIMPEXP_BASE wxLogStderr : public wxLog
 {
 public:
     // redirect log output to a FILE
-    wxLogStderr(FILE *fp = (FILE *) NULL);
+    wxLogStderr(FILE *fp = NULL);
 
 protected:
     // implement sink function
@@ -751,7 +751,14 @@ DECLARE_LOG_FUNCTION2(SysError, unsigned long, lErrCode);
     // empty functions if their parameters are complicated enough, but by
     // defining them as an empty inline function we ensure that even dumbest
     // compilers optimise them away
+#ifdef __BORLANDC__
+    // but Borland gives "W8019: Code has no effect" for wxLogNop() so we need
+    // to define it differently for it to avoid these warnings (same problem as
+    // with wxUnusedVar())
+    #define wxLogNop() { }
+#else
     inline void wxLogNop() { }
+#endif
 
     #define wxVLogDebug(fmt, valist) wxLogNop()
     #define wxVLogTrace(mask, fmt, valist) wxLogNop()