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