Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/glibc/patches/glibc-2.3.5-gcc4_fix_iconvdata-1.patch

    Contents of /trunk/glibc/patches/glibc-2.3.5-gcc4_fix_iconvdata-1.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 144 - (show annotations) (download)
    Tue May 8 20:06:05 2007 UTC (17 years ago) by niro
    File size: 1519 byte(s) 
    -import
    1 Submitted By: Matthew Burgess <matthew@linuxfromscratch.org>
    2 Date: 2005-07-15
    3 Initial Package Version: 2.3.5
    4 Upstream Status: From Upstream
    5 Origin: Ryan Oliver, courtesy of Dan Kegel's crosstool
    6 (http://kegel.com/crosstool/)
    7 Description: Fixes a compilation problem with gcc-4.0.x that results in:
    8 jis0208.h:32: error: array type has incomplete element type
    9
    10 diff -Naur glibc-2.3.5.orig/iconvdata/jis0208.h glibc-2.3.5/iconvdata/jis0208.h
    11 --- glibc-2.3.5.orig/iconvdata/jis0208.h 2003-06-11 21:40:42.000000000 +0000
    12 +++ glibc-2.3.5/iconvdata/jis0208.h 2005-07-15 18:32:20.726328528 +0000
    13 @@ -24,15 +24,6 @@
    14 #include <gconv.h>
    15 #include <stdint.h>
    16
    17 -/* Conversion table. */
    18 -extern const uint16_t __jis0208_to_ucs[];
    19 -
    20 -extern const char __jisx0208_from_ucs4_lat1[256][2];
    21 -extern const char __jisx0208_from_ucs4_greek[0xc1][2];
    22 -extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[];
    23 -extern const char __jisx0208_from_ucs_tab[][2];
    24 -
    25 -
    26 /* Struct for table with indeces in UCS mapping table. */
    27 struct jisx0208_ucs_idx
    28 {
    29 @@ -42,6 +33,15 @@
    30 };
    31
    32
    33 +/* Conversion table. */
    34 +extern const uint16_t __jis0208_to_ucs[];
    35 +
    36 +extern const char __jisx0208_from_ucs4_lat1[256][2];
    37 +extern const char __jisx0208_from_ucs4_greek[0xc1][2];
    38 +extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[];
    39 +extern const char __jisx0208_from_ucs_tab[][2];
    40 +
    41 +
    42 static inline uint32_t
    43 __attribute ((always_inline))
    44 jisx0208_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset)