diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-05-09 14:19:00 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-05-10 17:17:01 +0200 |
| commit | c4380ced324877a91a6df5db938c70ab53a257a1 (patch) | |
| tree | 5eb08889cf5d9d5b2cd5454214065c168fda27fe | |
| parent | 8f799c45659a2f5dd79941aa35d75486e5794eff (diff) | |
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>
| -rw-r--r-- | config_host/config_options.h.in | 6 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | sal/osl/all/log.cxx | 4 |
3 files changed, 1 insertions, 13 deletions
diff --git a/config_host/config_options.h.in b/config_host/config_options.h.in index e6c0f8d4c7b0..0223f089ce2b 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 b62b9e122a4d..ad94133135ff 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 25662507ce18..6a5884211949 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 |