sal/osl/w32/module.cxx | 6 ++---- smoketest/Module_smoketest.mk | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-)
New commits: commit 0b0dbd64bb589a6f0ab981f9740fff1dc500a055 Author: Tor Lillqvist <[email protected]> Date: Mon Mar 23 23:51:35 2015 +0200 Build libtest on Windows, too Doesn't as such work properly, as LibreOfficeKit doesn't work on Windows yet. From Juergen Funk's https://gerrit.libreoffice.org/#/c/13017/ . Change-Id: I685fddf0bada072e5dae485262b194b4fa5d26bc diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk index 7195fda..7e8b6d5 100644 --- a/smoketest/Module_smoketest.mk +++ b/smoketest/Module_smoketest.mk @@ -26,7 +26,7 @@ $(eval $(call gb_Module_add_targets,smoketest,\ endif endif -ifeq ($(OS),LINUX) +ifneq ($(filter LINUX WNT,$(OS)),) $(eval $(call gb_Module_add_check_targets,smoketest,\ Executable_libtest \ )) commit 5e5cc4702a0813e0ee27540c916599c7d2ad8cdf Author: Tor Lillqvist <[email protected]> Date: Mon Mar 23 23:48:00 2015 +0200 Sanitize a few SAL_INFOs Change-Id: Ib5e7e9250f90a9282c25446b606166499fc9d369 diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx index ac4e211..5612391 100644 --- a/sal/osl/w32/module.cxx +++ b/sal/osl/w32/module.cxx @@ -47,7 +47,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 /*nRtldM oslModule ret = 0; oslFileError nError; - SAL_INFO( "sal.osl", "{ osl_loadModule start: " << (LPTSTR)&strModuleName->buffer ); + SAL_INFO( "sal.osl", "osl_loadModule: " << OUString((sal_Unicode*)strModuleName->buffer, wcslen(strModuleName->buffer)) ); OSL_ASSERT(strModuleName); nError = osl_getSystemPathFromFileURL(strModuleName, &Module); @@ -87,7 +87,6 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 /*nRtldM SetErrorMode(errorMode); #endif - SAL_INFO( "sal.osl", "} osl_loadModule end: " << (LPTSTR)&strModuleName->buffer ); return ret; } @@ -102,7 +101,7 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nR UINT errorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS); oslModule ret = 0; - SAL_INFO( "sal.osl", "{ osl_loadModule start: " << pModuleName ); + SAL_INFO( "sal.osl", "osl_loadModule: " << pModuleName ); OSL_ASSERT(pModuleName); h = LoadLibrary(pModuleName); @@ -113,7 +112,6 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nR ret = (oslModule) h; SetErrorMode(errorMode); - SAL_INFO( "sal.osl", "} osl_loadModule end: " << pModuleName ); return ret; } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
