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

Timestamp:

Mar 26, 2012 4:29:58 PM (13 years ago)

Author:

vboxsync

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

77083

Message:

Runtime/r3/posix, RDP/client: Solaris 11 iconv change. Avoid referencing xpg5_iconv symbol by circumventing pragma redefine_extname.

File:

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

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

@@ -39 +39 @@
 #include <errno.h>
 #include <locale.h>
-#include <iconv.h>
+
+#if defined(RT_OS_SOLARIS)
+# if !defined(_XPG6)
+#  define VBOX_XPG6_TMP_DEF
+#  define _XPG6
+# endif
+# if defined(__USE_LEGACY_PROTOTYPES__)
+#  define VBOX_LEGACY_PROTO_TMP_DEF
+#  undef __USE_LEGACY_PROTOTYPES__
+# endif
+#endif /* RT_OS_SOLARIS */
+
+# include <iconv.h>
+
+#if defined(RT_OS_SOLARIS)
+# if defined(VBOX_XPG6_TMP_DEF)
+#  undef _XPG6
+#  undef VBOX_XPG6_TMP_DEF
+# endif
+# if defined(VBOX_LEGACY_PROTO_TMP_DEF)
+#  define __USE_LEGACY_PROTOTYPES__
+#  undef VBOX_LEGACY_PROTO_TMP_DEF
+# endif
+#endif /* RT_OS_SOLARIS */
+
 #include <wctype.h>
 
@@ -169 +193 @@
             const void *pvInputLeft = pvInput;
             void       *pvOutputLeft = pvOutput;
-#if defined(RT_OS_LINUX) || (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(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 (iconv(hIconv, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft) != (size_t)-1)
 #else
@@ -295 +319 @@
             const void *pvInputLeft = pvInput;
             void       *pvOutputLeft = pvOutput;
-#if defined(RT_OS_LINUX) || (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(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 (iconv(icHandle, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft) != (size_t)-1)
 #else