readwrite_helper.c -> readwrite_helper.cxx

Change-Id: I6d9f43a18e13cb291cb678b6faeeed7c0ec9de1a

6 files changed, 10 insertions, 36 deletions

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.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: */
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 4bc6d08de2db..6ae0d24c2b56 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -167,13 +167,13 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
 	sal/osl/unx/process \
 	sal/osl/unx/process_impl \
 	sal/osl/unx/profile \
+	sal/osl/unx/readwrite_helper \
 	sal/osl/unx/security \
 	sal/osl/unx/tempfile \
 	sal/osl/unx/thread \
         $(if $(filter DESKTOP,$(BUILD_TYPE)), sal/osl/unx/salinit) \
 ))
 $(eval $(call gb_Library_add_cobjects,sal,\
-	sal/osl/unx/readwrite_helper \
 	sal/osl/unx/socket \
 	sal/osl/unx/system \
 	sal/osl/unx/time \
diff --git a/sal/osl/unx/readwrite_helper.c b/sal/osl/unx/readwrite_helper.cxx
index 347f632bbbb1..93640ccd98d8 100644
--- a/sal/osl/unx/readwrite_helper.c
+++ b/sal/osl/unx/readwrite_helper.cxx
@@ -15,7 +15,7 @@
 sal_Bool safeWrite(int fd, void* data, sal_uInt32 dataSize)
 {
     sal_Int32 nToWrite = dataSize;
-    unsigned char* dataToWrite = data;
+    unsigned char* dataToWrite = static_cast<unsigned char *>(data);
 
     // Check for overflow as we convert a signed to an unsigned.
     OSL_ASSERT(dataSize == (sal_uInt32)nToWrite);
@@ -40,7 +40,7 @@ sal_Bool safeWrite(int fd, void* data, sal_uInt32 dataSize)
 sal_Bool safeRead( int fd, void* buffer, sal_uInt32 count )
 {
     sal_Int32 nToRead = count;
-    unsigned char* bufferForReading = buffer;
+    unsigned char* bufferForReading = static_cast<unsigned char *>(buffer);
 
     // Check for overflow as we convert a signed to an unsigned.
     OSL_ASSERT(count == (sal_uInt32)nToRead);