diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-19 12:01:55 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-19 13:01:35 +0100 |
| commit | e814dacc817e3d2f82c5c6c705152293baeedfe4 (patch) | |
| tree | 5c5934c6702addc57823aa46bb716c2cd273a21b /jurt/source | |
| parent | df451d6a539fdf3c7248e16203026bd8df423e53 (diff) | |
readwrite_helper.c -> readwrite_helper.cxx
Change-Id: I6d9f43a18e13cb291cb678b6faeeed7c0ec9de1a
Diffstat (limited to 'jurt/source')
| -rw-r--r-- | jurt/source/pipe/staticsalhack.cxx (renamed from jurt/source/pipe/staticsalhack_cxx.cxx) | 7 | ||||
| -rw-r--r-- | jurt/source/pipe/staticsalhack.h | 16 | ||||
| -rw-r--r-- | jurt/source/pipe/staticsalhack_c.c | 14 |
3 files changed, 6 insertions, 31 deletions
diff --git a/jurt/source/pipe/staticsalhack_cxx.cxx b/jurt/source/pipe/staticsalhack.cxx index 7b056ebbf17e..b2c10d4dc6f9 100644 --- a/jurt/source/pipe/staticsalhack_cxx.cxx +++ b/jurt/source/pipe/staticsalhack.cxx @@ -7,7 +7,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <staticsalhack.h> +#define DISABLE_DYNLOADING +#define FORCE_SYSALLOC +#define NO_CHILD_PROCESSES +#undef SAL_LOG_INFO +#undef SAL_LOG_WARN #include <sal/rtl/string.cxx> #undef IMPL_RTL_EMPTYSTRING @@ -34,6 +38,7 @@ #include <sal/osl/unx/process.cxx> #include <sal/osl/unx/process_impl.cxx> #include <sal/osl/unx/profile.cxx> +#include <sal/osl/unx/readwrite_helper.cxx> #include <sal/osl/unx/security.cxx> #include <sal/osl/unx/thread.cxx> #include <sal/osl/unx/uunxapi.cxx> diff --git a/jurt/source/pipe/staticsalhack.h b/jurt/source/pipe/staticsalhack.h deleted file mode 100644 index f1dc08332353..000000000000 --- a/jurt/source/pipe/staticsalhack.h +++ /dev/null @@ -1,16 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#define DISABLE_DYNLOADING -#define FORCE_SYSALLOC -#define NO_CHILD_PROCESSES -#undef SAL_LOG_INFO -#undef SAL_LOG_WARN - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/jurt/source/pipe/staticsalhack_c.c b/jurt/source/pipe/staticsalhack_c.c deleted file mode 100644 index 742b1143baca..000000000000 --- a/jurt/source/pipe/staticsalhack_c.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include <staticsalhack.h> - -#include <sal/osl/unx/readwrite_helper.c> - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |