|
yann@1
|
1 |
See http://sources.redhat.com/ml/libc-hacker/2005-02/msg00000.html
|
|
yann@1
|
2 |
and http://www.mail-archive.com/pld-cvs-commit@pld-linux.org/msg00229.html
|
|
yann@1
|
3 |
|
|
yann@1
|
4 |
Fixes
|
|
yann@1
|
5 |
In file included from jis0208.c:23:
|
|
yann@1
|
6 |
jis0208.h:32: error: array type has incomplete element type
|
|
yann@1
|
7 |
when building glibc with gcc-4.0
|
|
yann@1
|
8 |
The bug has been present since at least glibc-2.2.5.
|
|
yann@1
|
9 |
This patch applies cleanly to glibc-2.3.4
|
|
yann@1
|
10 |
|
|
yann@1
|
11 |
--- /home/dank/downloads/glibc-2.3-20050307/iconvdata/jis0208.h 2003-06-11 14:40:42.000000000 -0700
|
|
yann@1
|
12 |
+++ glibc-2.3-20050307/iconvdata/jis0208.h 2005-03-13 20:55:01.784054760 -0800
|
|
yann@1
|
13 |
@@ -24,15 +24,6 @@
|
|
yann@1
|
14 |
#include <gconv.h>
|
|
yann@1
|
15 |
#include <stdint.h>
|
|
yann@1
|
16 |
|
|
yann@1
|
17 |
-/* Conversion table. */
|
|
yann@1
|
18 |
-extern const uint16_t __jis0208_to_ucs[];
|
|
yann@1
|
19 |
-
|
|
yann@1
|
20 |
-extern const char __jisx0208_from_ucs4_lat1[256][2];
|
|
yann@1
|
21 |
-extern const char __jisx0208_from_ucs4_greek[0xc1][2];
|
|
yann@1
|
22 |
-extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[];
|
|
yann@1
|
23 |
-extern const char __jisx0208_from_ucs_tab[][2];
|
|
yann@1
|
24 |
-
|
|
yann@1
|
25 |
-
|
|
yann@1
|
26 |
/* Struct for table with indeces in UCS mapping table. */
|
|
yann@1
|
27 |
struct jisx0208_ucs_idx
|
|
yann@1
|
28 |
{
|
|
yann@1
|
29 |
@@ -42,6 +33,15 @@
|
|
yann@1
|
30 |
};
|
|
yann@1
|
31 |
|
|
yann@1
|
32 |
|
|
yann@1
|
33 |
+/* Conversion table. */
|
|
yann@1
|
34 |
+extern const uint16_t __jis0208_to_ucs[];
|
|
yann@1
|
35 |
+
|
|
yann@1
|
36 |
+extern const char __jisx0208_from_ucs4_lat1[256][2];
|
|
yann@1
|
37 |
+extern const char __jisx0208_from_ucs4_greek[0xc1][2];
|
|
yann@1
|
38 |
+extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[];
|
|
yann@1
|
39 |
+extern const char __jisx0208_from_ucs_tab[][2];
|
|
yann@1
|
40 |
+
|
|
yann@1
|
41 |
+
|
|
yann@1
|
42 |
static inline uint32_t
|
|
yann@1
|
43 |
__attribute ((always_inline))
|
|
yann@1
|
44 |
jisx0208_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset)
|