Changeset 68578 in vbox

Timestamp:

Aug 31, 2017 12:11:03 PM (8 years ago)

Author:

vboxsync

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

117795

Message:

merging vbglioc r117756: utf8-posix.cpp build fix for FreeBSD 10.3

File:

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

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

@@ -74 +74 @@
 # include "internal/thread.h"
 AssertCompile(sizeof(iconv_t) <= sizeof(void *));
+#endif
+
+
+/* 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_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE))
+# define NON_CONST_ICONV_INPUT
+#endif
+#ifdef RT_OS_FREEBSD
+# include <sys/param.h>
+# if __FreeBSD_version >= 1002000 /* Changed around 10.2.2 (https://svnweb.freebsd.org/base?view=revision&revision=281550) */
+#  define NON_CONST_ICONV_INPUT
+# else
+# error __FreeBSD_version__
+# endif
 #endif
 
@@ -195 +210 @@
             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. */
+#ifdef NON_CONST_ICONV_INPUT
             cchNonRev = iconv(hIconv, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft);
 #else
@@ -325 +340 @@
             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. */
+#ifdef NON_CONST_ICONV_INPUT
             cchNonRev = iconv(icHandle, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft);
 #else