mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sal: log windows traces to debugger console, take two

Browse Source 
This reverts most of commit 4c5b475278
and just keeps the OutputDebugStringA() call unconditionally.

Change-Id: Ia838052b3147ca2d66c7d28b04eadd9700244669
Reviewed-on: https://gerrit.libreoffice.org/54029
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Thorsten Behrens
2018-05-09 14:19:00 +02:00
committed by Mike Kaganski
parent 8f799c4565
commit c4380ced32
3 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config_host/config_options.h.in
View File

@@ -13,10 +13,4 @@
#define ENABLE_RUNTIME_OPTIMIZATIONS 0 #define ENABLE_RUNTIME_OPTIMIZATIONS 0
/*
* If this is a production build (where we might want to cut down on
* debugging options)
*/
#define ENABLE_RELEASE_BUILD 0
#endif #endif

4
configure.ac
View File

@@ -2243,13 +2243,11 @@ dnl ===================================================================
dnl Test whether build target is Release Build dnl Test whether build target is Release Build
dnl =================================================================== dnl ===================================================================
AC_MSG_CHECKING([whether build target is Release Build]) AC_MSG_CHECKING([whether build target is Release Build])
ENABLE_RELEASE_BUILD=
if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
ENABLE_RELEASE_BUILD=
else else
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
AC_DEFINE(ENABLE_RELEASE_BUILD)
ENABLE_RELEASE_BUILD=TRUE ENABLE_RELEASE_BUILD=TRUE
fi fi
AC_SUBST(ENABLE_RELEASE_BUILD) AC_SUBST(ENABLE_RELEASE_BUILD)

4
sal/osl/all/log.cxx
View File

@@ -22,7 +22,6 @@
#include <fstream> #include <fstream>
#include <config_global.h> #include <config_global.h>
#include <config_options.h>
#include <osl/thread.hxx> #include <osl/thread.hxx>
#include <rtl/string.h> #include <rtl/string.h>
#include <sal/detail/log.h> #include <sal/detail/log.h>
@@ -331,12 +330,9 @@ void sal_detail_log(
// write to Windows debugger console, too // write to Windows debugger console, too
OutputDebugStringA(s.str().c_str()); OutputDebugStringA(s.str().c_str());
#endif #endif
#if ! (defined(WNT) && ENABLE_RELEASE_BUILD)
// on Windows deployments, no one reads console output
s << '\n'; s << '\n';
std::fputs(s.str().c_str(), stderr); std::fputs(s.str().c_str(), stderr);
std::fflush(stderr); std::fflush(stderr);
#endif
} }
} }
#endif #endif