yann@1819
|
1 |
From d75ad2e129b3f22296cead3db53c784527deab60 Mon Sep 17 00:00:00 2001
|
yann@1819
|
2 |
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
|
yann@1819
|
3 |
Date: Fri, 18 Sep 2009 14:07:31 +0000
|
yann@1819
|
4 |
Subject: fix make {,install_}{,host}utils
|
yann@1819
|
5 |
|
yann@1819
|
6 |
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
|
yann@1819
|
7 |
---
|
yann@1819
|
8 |
diff --git a/extra/locale/programs/locale.c b/extra/locale/programs/locale.c
|
yann@1819
|
9 |
index 462a579..dfd2029 100644
|
yann@1819
|
10 |
--- a/extra/locale/programs/locale.c
|
yann@1819
|
11 |
+++ b/extra/locale/programs/locale.c
|
yann@1819
|
12 |
@@ -10,10 +10,9 @@
|
yann@1819
|
13 |
*
|
yann@1819
|
14 |
*/
|
yann@1819
|
15 |
|
yann@1819
|
16 |
-
|
yann@1819
|
17 |
+#include <string.h>
|
yann@1819
|
18 |
#include <stdio.h>
|
yann@1819
|
19 |
#include <stdlib.h>
|
yann@1819
|
20 |
-#include <string.h>
|
yann@1819
|
21 |
#include <langinfo.h>
|
yann@1819
|
22 |
#include <unistd.h>
|
yann@1819
|
23 |
#ifdef __UCLIBC_HAS_GETOPT_LONG__
|
yann@1819
|
24 |
diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c
|
yann@1819
|
25 |
index 290e680..3ce884d 100644
|
yann@1819
|
26 |
--- a/libc/misc/wchar/wchar.c
|
yann@1819
|
27 |
+++ b/libc/misc/wchar/wchar.c
|
yann@1819
|
28 |
@@ -171,7 +171,6 @@ extern size_t _wchar_utf8sntowcs(wchar_t *__restrict pwc, size_t wn,
|
yann@1819
|
29 |
|
yann@1819
|
30 |
extern size_t _wchar_wcsntoutf8s(char *__restrict s, size_t n,
|
yann@1819
|
31 |
const wchar_t **__restrict src, size_t wn) attribute_hidden;
|
yann@1819
|
32 |
-
|
yann@1819
|
33 |
#endif /* _LIBC */
|
yann@1819
|
34 |
/**********************************************************************/
|
yann@1819
|
35 |
#ifdef L_btowc
|
yann@1819
|
36 |
@@ -1201,45 +1200,6 @@ typedef struct {
|
yann@1819
|
37 |
int skip_invalid_input; /* To support iconv -c option. */
|
yann@1819
|
38 |
} _UC_iconv_t;
|
yann@1819
|
39 |
|
yann@1819
|
40 |
-
|
yann@1819
|
41 |
-
|
yann@1819
|
42 |
-#ifdef L_iconv
|
yann@1819
|
43 |
-
|
yann@1819
|
44 |
-#include <iconv.h>
|
yann@1819
|
45 |
-#include <string.h>
|
yann@1819
|
46 |
-#include <endian.h>
|
yann@1819
|
47 |
-#include <byteswap.h>
|
yann@1819
|
48 |
-
|
yann@1819
|
49 |
-#if (__BYTE_ORDER != __BIG_ENDIAN) && (__BYTE_ORDER != __LITTLE_ENDIAN)
|
yann@1819
|
50 |
-#error unsupported endianness for iconv
|
yann@1819
|
51 |
-#endif
|
yann@1819
|
52 |
-
|
yann@1819
|
53 |
-#ifndef __CTYPE_HAS_8_BIT_LOCALES
|
yann@1819
|
54 |
-#error currently iconv requires 8 bit locales
|
yann@1819
|
55 |
-#endif
|
yann@1819
|
56 |
-#ifndef __CTYPE_HAS_UTF_8_LOCALES
|
yann@1819
|
57 |
-#error currently iconv requires UTF-8 locales
|
yann@1819
|
58 |
-#endif
|
yann@1819
|
59 |
-
|
yann@1819
|
60 |
-
|
yann@1819
|
61 |
-enum {
|
yann@1819
|
62 |
- IC_WCHAR_T = 0xe0,
|
yann@1819
|
63 |
- IC_MULTIBYTE = 0xe0,
|
yann@1819
|
64 |
-#if __BYTE_ORDER == __BIG_ENDIAN
|
yann@1819
|
65 |
- IC_UCS_4 = 0xec,
|
yann@1819
|
66 |
- IC_UTF_32 = 0xe4,
|
yann@1819
|
67 |
- IC_UCS_2 = 0xe2,
|
yann@1819
|
68 |
- IC_UTF_16 = 0xea,
|
yann@1819
|
69 |
-#else
|
yann@1819
|
70 |
- IC_UCS_4 = 0xed,
|
yann@1819
|
71 |
- IC_UTF_32 = 0xe5,
|
yann@1819
|
72 |
- IC_UCS_2 = 0xe3,
|
yann@1819
|
73 |
- IC_UTF_16 = 0xeb,
|
yann@1819
|
74 |
-#endif
|
yann@1819
|
75 |
- IC_UTF_8 = 2,
|
yann@1819
|
76 |
- IC_ASCII = 1
|
yann@1819
|
77 |
-};
|
yann@1819
|
78 |
-
|
yann@1819
|
79 |
/* For the multibyte
|
yann@1819
|
80 |
* bit 0 means swap endian
|
yann@1819
|
81 |
* bit 1 means 2 byte
|
yann@1819
|
82 |
@@ -1247,8 +1207,13 @@ enum {
|
yann@1819
|
83 |
*
|
yann@1819
|
84 |
*/
|
yann@1819
|
85 |
|
yann@1819
|
86 |
+#if defined L_iconv && defined _LIBC
|
yann@1819
|
87 |
+/* Used externally only by iconv utility */
|
yann@1819
|
88 |
extern const unsigned char __iconv_codesets[];
|
yann@1819
|
89 |
libc_hidden_proto(__iconv_codesets)
|
yann@1819
|
90 |
+#endif
|
yann@1819
|
91 |
+
|
yann@1819
|
92 |
+#if defined L_iconv || defined L_iconv_main
|
yann@1819
|
93 |
const unsigned char __iconv_codesets[] =
|
yann@1819
|
94 |
"\x0a\xe0""WCHAR_T\x00" /* superset of UCS-4 but platform-endian */
|
yann@1819
|
95 |
#if __BYTE_ORDER == __BIG_ENDIAN
|
yann@1819
|
96 |
@@ -1281,7 +1246,48 @@ const unsigned char __iconv_codesets[] =
|
yann@1819
|
97 |
"\x08\x02""UTF-8\x00"
|
yann@1819
|
98 |
"\x0b\x01""US-ASCII\x00"
|
yann@1819
|
99 |
"\x07\x01""ASCII"; /* Must be last! (special case to save a nul) */
|
yann@1819
|
100 |
+#endif
|
yann@1819
|
101 |
+#if defined L_iconv && defined _LIBC
|
yann@1819
|
102 |
libc_hidden_data_def(__iconv_codesets)
|
yann@1819
|
103 |
+#endif
|
yann@1819
|
104 |
+
|
yann@1819
|
105 |
+
|
yann@1819
|
106 |
+#ifdef L_iconv
|
yann@1819
|
107 |
+
|
yann@1819
|
108 |
+#include <iconv.h>
|
yann@1819
|
109 |
+#include <string.h>
|
yann@1819
|
110 |
+#include <endian.h>
|
yann@1819
|
111 |
+#include <byteswap.h>
|
yann@1819
|
112 |
+
|
yann@1819
|
113 |
+#if (__BYTE_ORDER != __BIG_ENDIAN) && (__BYTE_ORDER != __LITTLE_ENDIAN)
|
yann@1819
|
114 |
+#error unsupported endianness for iconv
|
yann@1819
|
115 |
+#endif
|
yann@1819
|
116 |
+
|
yann@1819
|
117 |
+#ifndef __CTYPE_HAS_8_BIT_LOCALES
|
yann@1819
|
118 |
+#error currently iconv requires 8 bit locales
|
yann@1819
|
119 |
+#endif
|
yann@1819
|
120 |
+#ifndef __CTYPE_HAS_UTF_8_LOCALES
|
yann@1819
|
121 |
+#error currently iconv requires UTF-8 locales
|
yann@1819
|
122 |
+#endif
|
yann@1819
|
123 |
+
|
yann@1819
|
124 |
+
|
yann@1819
|
125 |
+enum {
|
yann@1819
|
126 |
+ IC_WCHAR_T = 0xe0,
|
yann@1819
|
127 |
+ IC_MULTIBYTE = 0xe0,
|
yann@1819
|
128 |
+#if __BYTE_ORDER == __BIG_ENDIAN
|
yann@1819
|
129 |
+ IC_UCS_4 = 0xec,
|
yann@1819
|
130 |
+ IC_UTF_32 = 0xe4,
|
yann@1819
|
131 |
+ IC_UCS_2 = 0xe2,
|
yann@1819
|
132 |
+ IC_UTF_16 = 0xea,
|
yann@1819
|
133 |
+#else
|
yann@1819
|
134 |
+ IC_UCS_4 = 0xed,
|
yann@1819
|
135 |
+ IC_UTF_32 = 0xe5,
|
yann@1819
|
136 |
+ IC_UCS_2 = 0xe3,
|
yann@1819
|
137 |
+ IC_UTF_16 = 0xeb,
|
yann@1819
|
138 |
+#endif
|
yann@1819
|
139 |
+ IC_UTF_8 = 2,
|
yann@1819
|
140 |
+ IC_ASCII = 1
|
yann@1819
|
141 |
+};
|
yann@1819
|
142 |
|
yann@1819
|
143 |
/* Experimentally off - libc_hidden_proto(strcasecmp) */
|
yann@1819
|
144 |
|
yann@1819
|
145 |
@@ -1575,6 +1581,4 @@ size_t weak_function iconv(iconv_t cd, char **__restrict inbuf,
|
yann@1819
|
146 |
}
|
yann@1819
|
147 |
return nrcount;
|
yann@1819
|
148 |
}
|
yann@1819
|
149 |
-
|
yann@1819
|
150 |
#endif
|
yann@1819
|
151 |
-
|
yann@1819
|
152 |
--
|
yann@1819
|
153 |
cgit v0.8.2.1
|