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 /sal | |
| parent | df451d6a539fdf3c7248e16203026bd8df423e53 (diff) | |
readwrite_helper.c -> readwrite_helper.cxx
Change-Id: I6d9f43a18e13cb291cb678b6faeeed7c0ec9de1a
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/Library_sal.mk | 2 | ||||
| -rw-r--r-- | sal/osl/unx/readwrite_helper.cxx (renamed from sal/osl/unx/readwrite_helper.c) | 4 |
2 files changed, 3 insertions, 3 deletions
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); |