diff options
Diffstat (limited to 'emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp')
| -rw-r--r-- | emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp index 5e2439bc2923..3a2a487b42dd 100644 --- a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp +++ b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp @@ -1,26 +1,20 @@ ---- src/VBox/Runtime/r3/posix/utf8-posix.cpp.orig 2015-03-16 17:04:36 UTC -+++ src/VBox/Runtime/r3/posix/utf8-posix.cpp -@@ -194,7 +194,10 @@ static int rtstrConvertCached(const void +--- src/VBox/Runtime/r3/posix/utf8-posix.cpp.orig 2015-04-14 15:41:38.000000000 -0400 ++++ src/VBox/Runtime/r3/posix/utf8-posix.cpp 2015-04-15 12:50:21.401092000 -0400 +@@ -194,7 +194,7 @@ const void *pvInputLeft = pvInput; void *pvOutputLeft = pvOutput; size_t cchNonRev; -#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */ -+#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) \ -+ || defined(RT_OS_FREEBSD) || defined(RT_OS_DRAGONFLY) \ -+ || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) -+/* there are different opinions about the constness of the input buffer. */ ++#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_FREEBSD) || defined(RT_OS_DRAGONFLY) || defined(RT_OS_SOLARIS) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */ cchNonRev = iconv(hIconv, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft); #else cchNonRev = iconv(hIconv, (const char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft); -@@ -324,7 +327,10 @@ static int rtStrConvertUncached(const vo +@@ -324,7 +324,7 @@ const void *pvInputLeft = pvInput; void *pvOutputLeft = pvOutput; size_t cchNonRev; -#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */ -+#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) \ -+ || defined(RT_OS_FREEBSD) || defined(RT_OS_DRAGONFLY) \ -+ || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) -+/* there are different opinions about the constness of the input buffer. */ ++#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_FREEBSD) || defined(RT_OS_DRAGONFLY) || defined(RT_OS_SOLARIS) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */ cchNonRev = iconv(icHandle, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft); #else cchNonRev = iconv(icHandle, (const char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft); |