blob: c2e695073e2670e91111d395aa22fb493f774b08 (
plain)
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
|
$NetBSD: patch-src_iconvwrapper.cpp,v 1.2 2022/11/03 12:35:00 nros Exp $
Fix building on NetBSD <=9 with non-POSIX iconv.
--- src/iconvwrapper.cpp.orig 2020-12-11 07:57:11.364756600 +0000
+++ src/iconvwrapper.cpp
@@ -9,6 +9,15 @@
#include <fcitx-utils/utf8.h>
#include <iconv.h>
+#if defined(__NetBSD__)
+#include <sys/param.h>
+#if __NetBSD_Prereq__(9,99,17)
+#define NETBSD_POSIX_ICONV 1
+#else
+#define NETBSD_POSIX_ICONV 0
+#endif
+#endif
+
class IconvWrapperPrivate {
public:
IconvWrapperPrivate(iconv_t conv) : conv_(conv) {}
@@ -37,8 +46,12 @@ std::vector<uint8_t> IconvWrapper::tryCo
result.resize(s.size() * 10);
size_t byteLength = s.size();
size_t byteRemains = result.size();
- char *data = const_cast<char *>(s.data());
char *outData = reinterpret_cast<char *>(result.data());
+#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
+ const char *data = s.data();
+#else
+ char *data = const_cast<char *>(s.data());
+#endif
auto err = iconv(conv, &data, &byteLength, &outData, &byteRemains);
if (err == static_cast<size_t>(-1)) {
continue;
|
