diff options
Diffstat (limited to 'iconvdata')
| -rw-r--r-- | iconvdata/Makefile | 16 | ||||
| -rw-r--r-- | iconvdata/ebcdic-es-a.c | 8 | ||||
| -rw-r--r-- | iconvdata/ebcdic-es.c | 8 | ||||
| -rw-r--r-- | iconvdata/ebcdic-is-friss.c | 8 | ||||
| -rw-r--r-- | iconvdata/ebcdic-uk.c | 8 | ||||
| -rw-r--r-- | iconvdata/gconv-modules | 7 | ||||
| -rw-r--r-- | iconvdata/iso8859-16.c | 9 | ||||
| -rw-r--r-- | iconvdata/iso8859-9e.c | 7 | ||||
| -rw-r--r-- | iconvdata/viscii.c | 9 |
9 files changed, 45 insertions, 35 deletions
diff --git a/iconvdata/Makefile b/iconvdata/Makefile index 7572f2789e..75ec7f06ea 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -217,13 +217,11 @@ install-others = $(addprefix $(inst_gconvdir)/, $(modules.so)) \ # We can build the conversion tables for numerous charsets automatically. gen-8bit-modules := iso8859-2 iso8859-3 iso8859-4 iso8859-6 iso8859-9 koi-8 \ - ebcdic-at-de ebcdic-at-de-a ebcdic-ca-fr \ - ebcdic-dk-no ebcdic-dk-no-a ebcdic-es ebcdic-es-a \ - ebcdic-es-s ebcdic-fi-se ebcdic-fi-se-a ebcdic-fr \ - ebcdic-is-friss ebcdic-it ebcdic-pt ebcdic-uk ebcdic-us \ + ebcdic-at-de ebcdic-at-de-a ebcdic-ca-fr ebcdic-dk-no \ + ebcdic-dk-no-a ebcdic-es-s ebcdic-fi-se ebcdic-fi-se-a \ + ebcdic-fr ebcdic-it ebcdic-pt ebcdic-us \ ibm037 ibm038 ibm274 ibm275 ibm423 ibm500 ibm870 ibm871 \ - ibm891 ibm903 ibm904 ibm905 ibm1047 iso8859-16 viscii \ - iso8859-9e + ibm891 ibm903 ibm904 ibm905 ibm1047 \ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273 \ ibm277 ibm278 ibm280 ibm281 ibm284 ibm285 ibm290 \ @@ -240,8 +238,10 @@ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273 \ iso8859-13 iso8859-14 iso8859-15 mac-uk sami-ws2 \ iso-ir-197 tis-620 koi8-u ibm874 cp10007 koi8-t \ georgian-ps georgian-academy iso-ir-209 mac-sami \ - iso8859-11 ibm866nav pt154 rk1048 mik brf \ - mac-centraleurope koi8-ru hp-roman8 hp-roman9 + iso8859-11 ibm866nav pt154 rk1048 mik brf \ + mac-centraleurope koi8-ru hp-roman8 hp-roman9 \ + ebcdic-es ebcdic-es-a ebcdic-is-friss ebcdic-uk \ + iso8859-16 viscii iso8859-9e gen-special-modules := iso8859-7jp diff --git a/iconvdata/ebcdic-es-a.c b/iconvdata/ebcdic-es-a.c index ca8c980e6d..d056820cff 100644 --- a/iconvdata/ebcdic-es-a.c +++ b/iconvdata/ebcdic-es-a.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-ES-A. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -20,10 +20,10 @@ #include <stdint.h> -/* Get the conversion table. */ -#include <ebcdic-es-a.h> +/* Specify the conversion table. */ +#define TABLES <ebcdic-es-a.h> #define CHARSET_NAME "EBCDIC-ES-A//" #define HAS_HOLES 1 /* Not all 256 character are defined. */ -#include <8bit-generic.c> +#include <8bit-gap.c> diff --git a/iconvdata/ebcdic-es.c b/iconvdata/ebcdic-es.c index 4b471452bb..bb447c0376 100644 --- a/iconvdata/ebcdic-es.c +++ b/iconvdata/ebcdic-es.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-ES. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -20,10 +20,10 @@ #include <stdint.h> -/* Get the conversion table. */ -#include <ebcdic-es.h> +/* Specify the conversion table. */ +#define TABLES <ebcdic-es.h> #define CHARSET_NAME "EBCDIC-ES//" #define HAS_HOLES 1 /* Not all 256 character are defined. */ -#include <8bit-generic.c> +#include <8bit-gap.c> diff --git a/iconvdata/ebcdic-is-friss.c b/iconvdata/ebcdic-is-friss.c index cf9416f9ba..0a05ab2c9d 100644 --- a/iconvdata/ebcdic-is-friss.c +++ b/iconvdata/ebcdic-is-friss.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-IS-FRISS. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -20,10 +20,10 @@ #include <stdint.h> -/* Get the conversion table. */ -#include <ebcdic-is-friss.h> +/* Specify the conversion table. */ +#define TABLES <ebcdic-is-friss.h> #define CHARSET_NAME "EBCDIC-IS-FRISS//" #define HAS_HOLES 1 /* Not all 256 character are defined. */ -#include <8bit-generic.c> +#include <8bit-gap.c> diff --git a/iconvdata/ebcdic-uk.c b/iconvdata/ebcdic-uk.c index 7137a80981..ea9ff705ae 100644 --- a/iconvdata/ebcdic-uk.c +++ b/iconvdata/ebcdic-uk.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-UK. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -20,10 +20,10 @@ #include <stdint.h> -/* Get the conversion table. */ -#include <ebcdic-uk.h> +/* Specify the conversion table. */ +#define TABLES <ebcdic-uk.h> #define CHARSET_NAME "EBCDIC-UK//" #define HAS_HOLES 1 /* Not all 256 character are defined. */ -#include <8bit-generic.c> +#include <8bit-gap.c> diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules index a8fcd8f0b3..dd3d372158 100644 --- a/iconvdata/gconv-modules +++ b/iconvdata/gconv-modules @@ -1927,3 +1927,10 @@ alias ISO8859-9E// ISO-8859-9E// alias ISO88599E// ISO-8859-9E// module ISO-8859-9E// INTERNAL ISO8859-9E 1 module INTERNAL ISO-8859-9E// ISO8859-9E 1 + +# from to module cost +alias ROMAN9// HP-ROMAN9// +alias R9// HP-ROMAN9// +alias HPROMAN9// HP-ROMAN9// +module HP-ROMAN9// INTERNAL HP-ROMAN9 1 +module INTERNAL HP-ROMAN9// HP-ROMAN9 1 diff --git a/iconvdata/iso8859-16.c b/iconvdata/iso8859-16.c index 39857a628a..41ed591629 100644 --- a/iconvdata/iso8859-16.c +++ b/iconvdata/iso8859-16.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-16. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000. @@ -18,11 +18,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -/* Get the conversion table. */ #include <stdint.h> -#include <iso8859-16.h> + +/* Specify the conversion table. */ +#define TABLES <iso8859-16.h> #define CHARSET_NAME "ISO-8859-16//" #define HAS_HOLES 0 /* All 256 character are defined. */ -#include <8bit-generic.c> +#include <8bit-gap.c> diff --git a/iconvdata/iso8859-9e.c b/iconvdata/iso8859-9e.c index 7048edac6f..300466399f 100644 --- a/iconvdata/iso8859-9e.c +++ b/iconvdata/iso8859-9e.c @@ -18,11 +18,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -/* Get the conversion table. */ #include <stdint.h> -#include <iso8859-9e.h> + +/* Specify the conversion table. */ +#define TABLES <iso8859-9e.h> #define CHARSET_NAME "ISO-8859-9E//" #define HAS_HOLES 0 /* All 256 character are defined. */ -#include <8bit-generic.c> +#include <8bit-gap.c> diff --git a/iconvdata/viscii.c b/iconvdata/viscii.c index 8e7d87e92b..672513d4d4 100644 --- a/iconvdata/viscii.c +++ b/iconvdata/viscii.c @@ -1,5 +1,5 @@ /* Conversion from and to VISCII. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000. @@ -18,11 +18,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -/* Get the conversion table. */ #include <stdint.h> -#include <viscii.h> + +/* Specify the conversion table. */ +#define TABLES <viscii.h> #define CHARSET_NAME "VISCII//" #define HAS_HOLES 0 /* All 256 character are defined. */ -#include <8bit-generic.c> +#include <8bit-gap.c> |