From 4af9612f2be9e023e762831207cbdb1d5f25906f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 3 Mar 2017 13:52:45 +0100 Subject: Change sal/osl/w32/*.c -> *.cxx ...and fix any ensuing errors/warnings, but no further C++'ification. Not sure whether any parts of dllentry.c would need to be extern "C", so leaving that one alone for now. TODO: Put definition of _CRT_RAND_S into bin/update_pch, so it doesn't get removed again from sal/inc/pch/precompiled_sal.hxx. (For the surrounding #ifndef see 244d22a3d27b303d44f59296a19dc4cb31fd429d "Work around -Werror,-Wunused-macros with clang-cl".) Change-Id: I2ada3717845eb0be0c559465d68e00e3a7720156 Reviewed-on: https://gerrit.libreoffice.org/34860 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann --- sal/Library_sal.mk | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'sal/Library_sal.mk') diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index ac254d167751..e5585b9bca32 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -225,32 +225,32 @@ else # $(OS) == WNT $(eval $(call gb_Library_add_exception_objects,sal,\ sal/osl/w32/backtrace \ + sal/osl/w32/conditn \ sal/osl/w32/file \ sal/osl/w32/file_dirvol \ + sal/osl/w32/file_error \ sal/osl/w32/file_url \ + sal/osl/w32/interlck \ + sal/osl/w32/memory \ sal/osl/w32/module \ + sal/osl/w32/mutex \ + sal/osl/w32/nlsupport \ sal/osl/w32/path_helper \ + sal/osl/w32/pipe \ sal/osl/w32/process \ sal/osl/w32/procimpl \ sal/osl/w32/profile \ + sal/osl/w32/random \ sal/osl/w32/salinit \ + sal/osl/w32/security \ sal/osl/w32/signal \ sal/osl/w32/socket \ sal/osl/w32/tempfile \ + sal/osl/w32/thread \ + sal/osl/w32/time \ )) $(eval $(call gb_Library_add_cobjects,sal,\ - sal/osl/w32/conditn \ sal/osl/w32/dllentry \ - sal/osl/w32/file_error \ - sal/osl/w32/interlck \ - sal/osl/w32/memory \ - sal/osl/w32/mutex \ - sal/osl/w32/nlsupport \ - sal/osl/w32/pipe \ - sal/osl/w32/random \ - sal/osl/w32/security \ - sal/osl/w32/thread \ - sal/osl/w32/time \ )) endif # ifneq ($(OS),WNT) -- cgit