[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - sal/osl

Thorsten Behrens Thorsten.Behrens at CIB.de
Mon Jan 16 04:05:17 UTC 2017


 sal/osl/all/log.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 62af107c1f58d822384f9f734b499b9c686a5b62
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Mon Jan 16 05:04:20 2017 +0100

    sal: log windows trace output to debugger console
    
    Change-Id: Ic8fea70fd3b0b2d4881cd30e3616f5bbf7c0c533

diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 7dd3880..0d920ba 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -34,6 +34,7 @@
 #include <android/log.h>
 #elif defined WNT
 #include <process.h>
+#include <windows.h>
 #define OSL_DETAIL_GETPID _getpid()
 #else
 #include <unistd.h>
@@ -305,10 +306,16 @@ void log(
         if (logFile) {
             *logFile << s.str();
         }
+#if defined WNT
+        else {
+            OutputDebugString(s.str().c_str());
+        }
+#else
         else {
             std::fputs(s.str().c_str(), stderr);
             std::fflush(stderr);
         }
+#endif
     }
 #endif
 }


More information about the Libreoffice-commits mailing list