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
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
$NetBSD: patch-ao,v 1.6 2009/06/13 11:55:51 hasso Exp $
--- src/corelib/codecs/qiconvcodec.cpp.orig 2009-02-25 22:09:21.000000000 +0100
+++ src/corelib/codecs/qiconvcodec.cpp
@@ -50,9 +50,14 @@
#include <stdio.h>
#include <dlfcn.h>
+// for __DragonFly_version
+#if defined(__DragonFly__)
+#include <sys/param.h>
+#endif
+
// unistd.h is needed for the _XOPEN_UNIX macro
#include <unistd.h>
-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)
+#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__)
# include <langinfo.h>
#endif
@@ -69,6 +74,9 @@
# else
# define UTF16 "UTF-16LE"
# endif
+#elif defined(__DragonFly__) && __DragonFly_version__ < 197700
+# define NO_BOM
+# define UTF16 "UTF-16"
#else
# define UTF16 "UTF-16"
#endif
@@ -218,7 +226,7 @@ QString QIconvCodec::convertToUnicode(co
IconvState *state = *pstate;
size_t inBytesLeft = len;
// best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM
-#ifdef GNU_LIBICONV
+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
// GNU doesn't disagree with POSIX :/
const char *inBytes = chars;
#else
@@ -306,7 +314,7 @@ QByteArray QIconvCodec::convertFromUnico
char *outBytes;
size_t inBytesLeft;
-#if defined(GNU_LIBICONV)
+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
const char **inBytesPtr = const_cast<const char **>(&inBytes);
#else
char **inBytesPtr = &inBytes;
@@ -454,11 +462,13 @@ iconv_t QIconvCodec::createIconv_t(const
static const char empty_codeset[] = "";
const char *codeset = empty_codeset;
cd = iconv_open(to ? to : codeset, from ? from : codeset);
+#elif defined(__NetBSD)
+ const char *codeset = 0;
#else
char *codeset = 0;
#endif
-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)
+#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__)
if (cd == (iconv_t) -1) {
codeset = nl_langinfo(CODESET);
if (codeset)
|
