Changeset 40651 in vbox for trunk/src/VBox/RDP/client

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/RDP/client

Files:

• Makefile.kmk (modified) (1 diff)
• rdp.c (modified) (1 diff)
• xclip.c (modified) (1 diff)

trunk/src/VBox/RDP/client/Makefile.kmk

@@ -61 +61 @@
 # define __USE_LEGACY_PROTOTYPES__ until our buildbox is updated sufficiently
 rdesktop-vrdp_DEFS.solaris = \
-        HAVE_SYS_FILIO_H=1 RDPSND_SUN=1 HAVE_ICONV_H=1 ICONV_CONST=const STAT_STATVFS64=1 _FILE_OFFSET_BITS=64 \
+        HAVE_SYS_FILIO_H=1 RDPSND_SUN=1 HAVE_ICONV_H=1 STAT_STATVFS64=1 _FILE_OFFSET_BITS=64 \
         DIR_FD_MEMBER_NAME=dd_fd __USE_LEGACY_PROTOTYPES__ HAVE_SYS_VFS_H=1 HAVE_SYS_STATFS_H=1
+ifdef VBOX_SOLARIS_11_LEGACY_ICONV
+ rdesktop-vrdp_DEFS.solaris += VBOX_SOLARIS_11_LEGACY_ICONV ICONV_CONST=const
+else
+ rdesktop-vrdp_DEFS.solaris += ICONV_CONST=
+endif
 rdesktop-vrdp_DEFS.freebsd = \
         RDPSND_OSS=1 HAVE_ICONV_H=1 ICONV_CONST=const HAVE_SYS_STATVFS_H=1 _FILE_OFFSET_BITS=64 HAVE_DIRFD=1

trunk/src/VBox/RDP/client/rdp.c

@@ -38 +38 @@
 #ifdef HAVE_ICONV
 #ifdef HAVE_ICONV_H
+
+#if defined(RT_OS_SOLARIS) && !defined(_XPG6)
+# define VBOX_XPG6_TMP_DEF
+# define _XPG6
+#endif
+#if defined(RT_OS_SOLARIS) && defined(__USE_LEGACY_PROTOTYPES__)
+# define VBOX_LEGACY_PROTO_TMP_DEF
+# undef __USE_LEGACY_PROTOTYPES__
+#endif
 #include <iconv.h>
+#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
 
 #ifndef ICONV_CONST
 #define ICONV_CONST ""
+#endif
 #endif
 #endif

trunk/src/VBox/RDP/client/xclip.c

@@ -46 +46 @@
 #ifdef HAVE_ICONV_H
 #include <langinfo.h>
+
+#if defined(RT_OS_SOLARIS) && !defined(_XPG6)
+# define VBOX_XPG6_TMP_DEF
+# define _XPG6
+#endif
+#if defined(RT_OS_SOLARIS) && defined(__USE_LEGACY_PROTOTYPES__)
+# define VBOX_LEGACY_PROTO_TMP_DEF
+# undef __USE_LEGACY_PROTOTYPES__
+# endif
 #include <iconv.h>
+#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
+
 #define USE_UNICODE_CLIPBOARD
 #endif