From e814dacc817e3d2f82c5c6c705152293baeedfe4 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 19 Nov 2014 12:01:55 +0100
Subject: readwrite_helper.c -> readwrite_helper.cxx

Change-Id: I6d9f43a18e13cb291cb678b6faeeed7c0ec9de1a
---
 jurt/Library_jpipe.mk                  |  3 +-
 jurt/source/pipe/staticsalhack.cxx     | 67 ++++++++++++++++++++++++++++++++++
 jurt/source/pipe/staticsalhack.h       | 16 --------
 jurt/source/pipe/staticsalhack_c.c     | 14 -------
 jurt/source/pipe/staticsalhack_cxx.cxx | 62 -------------------------------
 5 files changed, 68 insertions(+), 94 deletions(-)
 create mode 100644 jurt/source/pipe/staticsalhack.cxx
 delete mode 100644 jurt/source/pipe/staticsalhack.h
 delete mode 100644 jurt/source/pipe/staticsalhack_c.c
 delete mode 100644 jurt/source/pipe/staticsalhack_cxx.cxx

(limited to 'jurt')

diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk
index 6d1512e41a71..8cb8e58d9d9b 100644
--- a/jurt/Library_jpipe.mk
+++ b/jurt/Library_jpipe.mk
@@ -48,11 +48,10 @@ else
 
 $(eval $(call gb_Library_add_cobjects,jpipe, \
     jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection \
-    jurt/source/pipe/staticsalhack_c \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,jpipe, \
-    jurt/source/pipe/staticsalhack_cxx \
+    jurt/source/pipe/staticsalhack \
 ))
 
 $(eval $(call gb_Library_add_defs,jpipe, \
diff --git a/jurt/source/pipe/staticsalhack.cxx b/jurt/source/pipe/staticsalhack.cxx
new file mode 100644
index 000000000000..b2c10d4dc6f9
--- /dev/null
+++ b/jurt/source/pipe/staticsalhack.cxx
@@ -0,0 +1,67 @@
+/* -*- 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
+
+#include <sal/rtl/string.cxx>
+#undef IMPL_RTL_EMPTYSTRING
+#undef IMPL_RTL_STRCODE
+#undef IMPL_RTL_STRINGDATA
+#undef IMPL_RTL_STRINGNAME
+#undef IMPL_RTL_STRNAME
+#undef IMPL_RTL_USTRCODE
+#undef RTL_LOG_STRING_BITS
+#include <sal/rtl/ustring.cxx>
+
+#include <sal/osl/unx/conditn.cxx>
+#include <sal/osl/unx/file.cxx>
+#include <sal/osl/unx/file_error_transl.cxx>
+#include <sal/osl/unx/file_misc.cxx>
+#include <sal/osl/unx/file_path_helper.cxx>
+#include <sal/osl/unx/file_stat.cxx>
+#include <sal/osl/unx/file_url.cxx>
+#include <sal/osl/unx/memory.cxx>
+#include <sal/osl/unx/module.cxx>
+#include <sal/osl/unx/mutex.cxx>
+#include <sal/osl/unx/nlsupport.cxx>
+#include <sal/osl/unx/pipe.cxx>
+#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>
+#include <sal/rtl/alloc_arena.cxx>
+#include <sal/rtl/alloc_cache.cxx>
+#include <sal/rtl/alloc_fini.cxx>
+#include <sal/rtl/alloc_global.cxx>
+#include <sal/rtl/bootstrap.cxx>
+#include <sal/rtl/byteseq.cxx>
+#include <sal/rtl/hash.cxx>
+#include <sal/rtl/locale.cxx>
+#include <sal/rtl/math.cxx>
+#include <sal/rtl/strbuf.cxx>
+#include <sal/rtl/strimp.cxx>
+#include <sal/rtl/uri.cxx>
+#include <sal/rtl/ustrbuf.cxx>
+#include <sal/textenc/converter.cxx>
+#include <sal/textenc/convertsimple.cxx>
+#include <sal/textenc/handleundefinedunicodetotextchar.cxx>
+#include <sal/textenc/tcvtutf8.cxx>
+#include <sal/textenc/tencinfo.cxx>
+#include <sal/textenc/textcvt.cxx>
+#include <sal/textenc/textenc.cxx>
+#include <sal/textenc/unichars.cxx>
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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: */
diff --git a/jurt/source/pipe/staticsalhack_cxx.cxx b/jurt/source/pipe/staticsalhack_cxx.cxx
deleted file mode 100644
index 7b056ebbf17e..000000000000
--- a/jurt/source/pipe/staticsalhack_cxx.cxx
+++ /dev/null
@@ -1,62 +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/rtl/string.cxx>
-#undef IMPL_RTL_EMPTYSTRING
-#undef IMPL_RTL_STRCODE
-#undef IMPL_RTL_STRINGDATA
-#undef IMPL_RTL_STRINGNAME
-#undef IMPL_RTL_STRNAME
-#undef IMPL_RTL_USTRCODE
-#undef RTL_LOG_STRING_BITS
-#include <sal/rtl/ustring.cxx>
-
-#include <sal/osl/unx/conditn.cxx>
-#include <sal/osl/unx/file.cxx>
-#include <sal/osl/unx/file_error_transl.cxx>
-#include <sal/osl/unx/file_misc.cxx>
-#include <sal/osl/unx/file_path_helper.cxx>
-#include <sal/osl/unx/file_stat.cxx>
-#include <sal/osl/unx/file_url.cxx>
-#include <sal/osl/unx/memory.cxx>
-#include <sal/osl/unx/module.cxx>
-#include <sal/osl/unx/mutex.cxx>
-#include <sal/osl/unx/nlsupport.cxx>
-#include <sal/osl/unx/pipe.cxx>
-#include <sal/osl/unx/process.cxx>
-#include <sal/osl/unx/process_impl.cxx>
-#include <sal/osl/unx/profile.cxx>
-#include <sal/osl/unx/security.cxx>
-#include <sal/osl/unx/thread.cxx>
-#include <sal/osl/unx/uunxapi.cxx>
-#include <sal/rtl/alloc_arena.cxx>
-#include <sal/rtl/alloc_cache.cxx>
-#include <sal/rtl/alloc_fini.cxx>
-#include <sal/rtl/alloc_global.cxx>
-#include <sal/rtl/bootstrap.cxx>
-#include <sal/rtl/byteseq.cxx>
-#include <sal/rtl/hash.cxx>
-#include <sal/rtl/locale.cxx>
-#include <sal/rtl/math.cxx>
-#include <sal/rtl/strbuf.cxx>
-#include <sal/rtl/strimp.cxx>
-#include <sal/rtl/uri.cxx>
-#include <sal/rtl/ustrbuf.cxx>
-#include <sal/textenc/converter.cxx>
-#include <sal/textenc/convertsimple.cxx>
-#include <sal/textenc/handleundefinedunicodetotextchar.cxx>
-#include <sal/textenc/tcvtutf8.cxx>
-#include <sal/textenc/tencinfo.cxx>
-#include <sal/textenc/textcvt.cxx>
-#include <sal/textenc/textenc.cxx>
-#include <sal/textenc/unichars.cxx>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit