sal: log windows traces to debugger console, take two
This reverts most of commit 4c5b4752786ae2c174cd8fa8aa42b27a0994f34a
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>
diff --git a/config_host/config_options.h.in b/config_host/config_options.h.in
index e6c0f8d..0223f08 100644
--- a/config_host/config_options.h.in
+++ b/config_host/config_options.h.in
@@ -13,10 +13,4 @@
#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
diff --git a/configure.ac b/configure.ac
index b62b9e1..ad94133 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2243,13 +2243,11 @@ dnl ===================================================================
dnl Test whether build target is Release Build
dnl ===================================================================
AC_MSG_CHECKING([whether build target is Release Build])
ENABLE_RELEASE_BUILD=
if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then
AC_MSG_RESULT([no])
ENABLE_RELEASE_BUILD=
else
AC_MSG_RESULT([yes])
AC_DEFINE(ENABLE_RELEASE_BUILD)
ENABLE_RELEASE_BUILD=TRUE
fi
AC_SUBST(ENABLE_RELEASE_BUILD)
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 2566250..6a58842 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -22,7 +22,6 @@
#include <fstream>
#include <config_global.h>
#include <config_options.h>
#include <osl/thread.hxx>
#include <rtl/string.h>
#include <sal/detail/log.h>
@@ -331,12 +330,9 @@ void sal_detail_log(
// write to Windows debugger console, too
OutputDebugStringA(s.str().c_str());
#endif
#if ! (defined(WNT) && ENABLE_RELEASE_BUILD)
// on Windows deployments, no one reads console output
s << '\n';
std::fputs(s.str().c_str(), stderr);
std::fflush(stderr);
#endif
}
}
#endif
