1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
Description: we use GNU iconv
Index: virtualbox/src/VBox/Runtime/r3/posix/utf8-posix.cpp
===================================================================
--- virtualbox.orig/src/VBox/Runtime/r3/posix/utf8-posix.cpp 2014-06-04 16:43:29.395002784 +0400
+++ virtualbox/src/VBox/Runtime/r3/posix/utf8-posix.cpp 2014-06-05 10:40:53.733241898 +0400
@@ -194,11 +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. */
- cchNonRev = iconv(hIconv, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft);
-#else
cchNonRev = iconv(hIconv, (const char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft);
-#endif
if (cchNonRev != (size_t)-1)
{
if (!cbInLeft)
@@ -324,11 +320,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. */
- cchNonRev = iconv(icHandle, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft);
-#else
cchNonRev = iconv(icHandle, (const char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft);
-#endif
if (cchNonRev != (size_t)-1)
{
if (!cbInLeft)
|
