Changeset 40654 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Mar 26, 2012 6:20:52 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

77086

Message:

Runtime/r3, RDP: Solaris 11 iconv change.

File:

• trunk/src/VBox/Runtime/r3/posix/utf8-posix.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/posix/utf8-posix.cpp

@@ -40 +40 @@
 #include <locale.h>
 
+/* iconv prototype changed with 165+ (thanks to PSARC/2010/160 Bugster 7037400) */
 #if defined(RT_OS_SOLARIS)
 # if !defined(_XPG6)
@@ -193 +194 @@
             const void *pvInputLeft = pvInput;
             void       *pvOutputLeft = pvOutput;
-#if defined(RT_OS_LINUX) || (defined(RT_OS_SOLARIS) && !defined(VBOX_SOLARIS_11_LEGACY_ICONV)) || (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_SOLARIS) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */
             if (iconv(hIconv, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft) != (size_t)-1)
 #else
@@ -319 +320 @@
             const void *pvInputLeft = pvInput;
             void       *pvOutputLeft = pvOutput;
-#if defined(RT_OS_LINUX) || (defined(RT_OS_SOLARIS) && !defined(VBOX_SOLARIS_11_LEGACY_ICONV)) || (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_SOLARIS) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */
             if (iconv(icHandle, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft) != (size_t)-1)
 #else