summaryrefslogtreecommitdiff
path: root/iconvdata
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-02-16 12:31:10 +0000
committerRoland McGrath <roland@gnu.org>2005-02-16 12:31:10 +0000
commit833861be818bb5d45ab0c47370b84068dfb2fedf (patch)
tree2f1754a415c378f6b067f9158cc42df24d4641d2 /iconvdata
parentc397a0064061e28a00eea873669e59f3983db791 (diff)
import later fedora-branch tweaks
Diffstat (limited to 'iconvdata')
-rw-r--r--iconvdata/jis0208.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/iconvdata/jis0208.h b/iconvdata/jis0208.h
index 8255bafc62..9dea38973c 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,2005 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 1999, 2000, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -24,15 +24,6 @@
#include <gconv.h>
#include <stdint.h>
-/* Struct for table with indeces in UCS mapping table. */
-struct jisx0208_ucs_idx
-{
- uint16_t start;
- uint16_t end;
- uint16_t idx;
-};
-
-
/* Conversion table. */
extern const uint16_t __jis0208_to_ucs[];
@@ -42,6 +33,15 @@ 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
+{
+ uint16_t start;
+ uint16_t end;
+ uint16_t idx;
+};
+
+
static inline uint32_t
__attribute ((always_inline))
jisx0208_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset)