From: Roland McGrath Date: Mon, 17 Oct 2005 04:52:39 +0000 (+0000) Subject: 2005-02-07 Richard Henderson X-Git-Tag: cvs/fedora-glibc-2_3-20051017T0518~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9871f0a9931125425783141c0821014c043f5f04;p=thirdparty%2Fglibc.git 2005-02-07 Richard Henderson [BZ #721] * iconvdata/jis0208.h (struct jisx0208_ucs_idx): Move before use. --- diff --git a/iconvdata/jis0208.h b/iconvdata/jis0208.h index 9dea38973ca..8255bafc62f 100644 --- a/iconvdata/jis0208.h +++ b/iconvdata/jis0208.h @@ -1,5 +1,5 @@ /* Access functions for JISX0208 conversion. - Copyright (C) 1997, 1998, 1999, 2000, 2003 Free Software Foundation, Inc. + Copyright (C) 1997,1998,1999,2000,2003,2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -24,15 +24,6 @@ #include #include -/* Conversion table. */ -extern const uint16_t __jis0208_to_ucs[]; - -extern const char __jisx0208_from_ucs4_lat1[256][2]; -extern const char __jisx0208_from_ucs4_greek[0xc1][2]; -extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[]; -extern const char __jisx0208_from_ucs_tab[][2]; - - /* Struct for table with indeces in UCS mapping table. */ struct jisx0208_ucs_idx { @@ -42,6 +33,15 @@ struct jisx0208_ucs_idx }; +/* Conversion table. */ +extern const uint16_t __jis0208_to_ucs[]; + +extern const char __jisx0208_from_ucs4_lat1[256][2]; +extern const char __jisx0208_from_ucs4_greek[0xc1][2]; +extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[]; +extern const char __jisx0208_from_ucs_tab[][2]; + + static inline uint32_t __attribute ((always_inline)) jisx0208_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset)