aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--iconvdata/.cvsignore5
-rw-r--r--iconvdata/Makefile198
-rw-r--r--locale/iso-4217.def54
4 files changed, 141 insertions, 120 deletions
diff --git a/ChangeLog b/ChangeLog
index d4c707f..f511746 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1998-04-24 Ulrich Drepper <drepper@cygnus.com>
+
+ * iconvdata/Makefile: Put generated headers in build directory.
+
1998-04-23 22:43 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-load.c (fillin_rpath): Handle empty element returned by
diff --git a/iconvdata/.cvsignore b/iconvdata/.cvsignore
index ad7cfe4..91c8c8c 100644
--- a/iconvdata/.cvsignore
+++ b/iconvdata/.cvsignore
@@ -27,7 +27,7 @@ ibm037.h
ibm038.h
ibm1004.h
ibm1026.h
-ibm1047.c
+ibm1047.h
ibm256.h
ibm273.h
ibm274.h
@@ -66,7 +66,8 @@ ibm891.h
ibm903.h
ibm904.h
ibm905.h
-ibm918.c
+ibm912.h
+ibm918.h
iso8859-10.h
iso8859-2.h
iso8859-3.h
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 45d5dad..439a650 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -24,19 +24,21 @@ subdir := iconvdata
# Names of all the shared objects which implement the transformations.
modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \
ISO8859-6 ISO8859-7 ISO8859-8 ISO8859-9 ISO8859-10 \
- T.61 ISO_6937 SJIS KOI-8 KOI8-R LATIN-GREEK LATIN-GREEK-1 \
- HP-ROMAN8 EBCDIC-AT-DE EBCDIC-AT-DE-A EBCDIC-CA-FR \
- EUC-KR UHC JOHAB libJIS libKSC BIG5 EUC-JP libGB \
- EUC-CN libCNS EUC-TW ISO646 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 IBM037 IBM038 IBM256 IBM273 IBM274 IBM275 IBM277 \
- IBM278 IBM280 IBM281 IBM284 IBM285 IBM290 IBM297 IBM420 \
- IBM423 IBM424 IBM437 IBM500 IBM850 IBM851 IBM852 IBM855 \
- IBM857 IBM860 IBM861 IBM862 IBM863 IBM864 IBM865 IBM868 \
- IBM869 IBM870 IBM871 IBM875 IBM880 IBM891 IBM903 IBM904 \
- IBM905 IBM918 IBM1004 IBM1026 IBM1047 CP1250 CP1251 CP1252 \
- CP1253 CP1254 CP1255 CP1256 CP1257
+ T.61 ISO_6937 SJIS KOI-8 HP-ROMAN8 EBCDIC-AT-DE \
+ EBCDIC-AT-DE-A EBCDIC-CA-FR EUC-KR UHC JOHAB libJIS libKSC \
+ BIG5 EUC-JP libGB EUC-CN libCNS EUC-TW ISO646 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 IBM037 IBM038 IBM274 IBM275 IBM423 IBM424 \
+ IBM500 IBM870 IBM871 IBM891 IBM903 IBM904 IBM905 IBM1047
+ifneq ($(PERL),no)
+modules += KOI8-R LATIN-GREEK LATIN-GREEK-1 IBM256 IBM273 IBM277 IBM278 \
+ IBM280 IBM281 IBM284 IBM285 IBM290 IBM297 IBM420 IBM437 \
+ IBM850 IBM851 IBM852 IBM855 IBM857 IBM860 IBM861 IBM862 \
+ IBM863 IBM864 IBM865 IBM868 IBM869 IBM875 IBM880 IBM918 \
+ IBM1004 IBM1026 CP1250 CP1251 CP1252 CP1253 CP1254 CP1255 \
+ CP1256 CP1257
+endif
modules.so := $(addsuffix .so, $(modules))
@@ -254,182 +256,184 @@ perl-generated-headers := koi8-r.h latin-greek.h latin-greek-1.h \
cp1255.h cp1256.h cp1257.h
# The headers must be generated before the compilation.
-before-compile = $(sed-generated-headers) $(perl-generated-headers)
+before-compile = $(addprefix $(objpfx),$(sed-generated-headers)) \
+ $(addprefix $(objpfx),$(perl-generated-headers))
# Rules to generate the headers.
-iso8859-2.h: ../localedata/charmaps/ISO-8859-2 Makefile
+$(objpfx)iso8859-2.h: ../localedata/charmaps/ISO-8859-2 Makefile
$(generate-8bit-table)
-iso8859-3.h: ../localedata/charmaps/ISO-8859-3 Makefile
+$(objpfx)iso8859-3.h: ../localedata/charmaps/ISO-8859-3 Makefile
$(generate-8bit-table)
-iso8859-4.h: ../localedata/charmaps/ISO-8859-4 Makefile
+$(objpfx)iso8859-4.h: ../localedata/charmaps/ISO-8859-4 Makefile
$(generate-8bit-table)
-iso8859-5.h: ../localedata/charmaps/ISO-8859-5 Makefile
+$(objpfx)iso8859-5.h: ../localedata/charmaps/ISO-8859-5 Makefile
$(generate-8bit-table)
-iso8859-6.h: ../localedata/charmaps/ISO-8859-6 Makefile
+$(objpfx)iso8859-6.h: ../localedata/charmaps/ISO-8859-6 Makefile
$(generate-8bit-table)
-iso8859-7.h: ../localedata/charmaps/ISO-8859-7 Makefile
+$(objpfx)iso8859-7.h: ../localedata/charmaps/ISO-8859-7 Makefile
$(generate-8bit-table)
-iso8859-8.h: ../localedata/charmaps/ISO-8859-8 Makefile
+$(objpfx)iso8859-8.h: ../localedata/charmaps/ISO-8859-8 Makefile
$(generate-8bit-table)
-iso8859-9.h: ../localedata/charmaps/ISO-8859-9 Makefile
+$(objpfx)iso8859-9.h: ../localedata/charmaps/ISO-8859-9 Makefile
$(generate-8bit-table)
-iso8859-10.h: ../localedata/charmaps/ISO-8859-10 Makefile
+$(objpfx)iso8859-10.h: ../localedata/charmaps/ISO-8859-10 Makefile
$(generate-8bit-table)
-koi-8.h: ../localedata/charmaps/KOI-8 Makefile
+$(objpfx)koi-8.h: ../localedata/charmaps/KOI-8 Makefile
$(generate-8bit-table)
-hp-roman8.h: ../localedata/charmaps/HP-ROMAN8 Makefile
+$(objpfx)hp-roman8.h: ../localedata/charmaps/HP-ROMAN8 Makefile
$(generate-8bit-table)
-ebcdic-at-de.h: ../localedata/charmaps/EBCDIC-AT-DE Makefile
+$(objpfx)ebcdic-at-de.h: ../localedata/charmaps/EBCDIC-AT-DE Makefile
$(generate-8bit-table)
-ebcdic-at-de-a.h: ../localedata/charmaps/EBCDIC-AT-DE-A Makefile
+$(objpfx)ebcdic-at-de-a.h: ../localedata/charmaps/EBCDIC-AT-DE-A Makefile
$(generate-8bit-table)
-ebcdic-ca-fr.h: ../localedata/charmaps/EBCDIC-CA-FR Makefile
+$(objpfx)ebcdic-ca-fr.h: ../localedata/charmaps/EBCDIC-CA-FR Makefile
$(generate-8bit-table)
-ebcdic-dk-no.h: ../localedata/charmaps/EBCDIC-DK-NO Makefile
+$(objpfx)ebcdic-dk-no.h: ../localedata/charmaps/EBCDIC-DK-NO Makefile
$(generate-8bit-table)
-ebcdic-dk-no-a.h: ../localedata/charmaps/EBCDIC-DK-NO-A Makefile
+$(objpfx)ebcdic-dk-no-a.h: ../localedata/charmaps/EBCDIC-DK-NO-A Makefile
$(generate-8bit-table)
-ebcdic-es.h: ../localedata/charmaps/EBCDIC-ES Makefile
+$(objpfx)ebcdic-es.h: ../localedata/charmaps/EBCDIC-ES Makefile
$(generate-8bit-table)
-ebcdic-es-a.h: ../localedata/charmaps/EBCDIC-ES-A Makefile
+$(objpfx)ebcdic-es-a.h: ../localedata/charmaps/EBCDIC-ES-A Makefile
$(generate-8bit-table)
-ebcdic-es-s.h: ../localedata/charmaps/EBCDIC-ES-S Makefile
+$(objpfx)ebcdic-es-s.h: ../localedata/charmaps/EBCDIC-ES-S Makefile
$(generate-8bit-table)
-ebcdic-fi-se.h: ../localedata/charmaps/EBCDIC-FI-SE Makefile
+$(objpfx)ebcdic-fi-se.h: ../localedata/charmaps/EBCDIC-FI-SE Makefile
$(generate-8bit-table)
-ebcdic-fi-se-a.h: ../localedata/charmaps/EBCDIC-FI-SE-A Makefile
+$(objpfx)ebcdic-fi-se-a.h: ../localedata/charmaps/EBCDIC-FI-SE-A Makefile
$(generate-8bit-table)
-ebcdic-fr.h: ../localedata/charmaps/EBCDIC-FR Makefile
+$(objpfx)ebcdic-fr.h: ../localedata/charmaps/EBCDIC-FR Makefile
$(generate-8bit-table)
-ebcdic-is-friss.h: ../localedata/charmaps/EBCDIC-IS-FRISS Makefile
+$(objpfx)ebcdic-is-friss.h: ../localedata/charmaps/EBCDIC-IS-FRISS Makefile
$(generate-8bit-table)
-ebcdic-it.h: ../localedata/charmaps/EBCDIC-IT Makefile
+$(objpfx)ebcdic-it.h: ../localedata/charmaps/EBCDIC-IT Makefile
$(generate-8bit-table)
-ebcdic-pt.h: ../localedata/charmaps/EBCDIC-PT Makefile
+$(objpfx)ebcdic-pt.h: ../localedata/charmaps/EBCDIC-PT Makefile
$(generate-8bit-table)
-ebcdic-uk.h: ../localedata/charmaps/EBCDIC-UK Makefile
+$(objpfx)ebcdic-uk.h: ../localedata/charmaps/EBCDIC-UK Makefile
$(generate-8bit-table)
-ebcdic-us.h: ../localedata/charmaps/EBCDIC-US Makefile
+$(objpfx)ebcdic-us.h: ../localedata/charmaps/EBCDIC-US Makefile
$(generate-8bit-table)
-ibm037.h: ../localedata/charmaps/IBM037 Makefile
+$(objpfx)ibm037.h: ../localedata/charmaps/IBM037 Makefile
$(generate-8bit-table)
-ibm038.h: ../localedata/charmaps/IBM038 Makefile
+$(objpfx)ibm038.h: ../localedata/charmaps/IBM038 Makefile
$(generate-8bit-table)
-ibm274.h: ../localedata/charmaps/IBM274 Makefile
+$(objpfx)ibm274.h: ../localedata/charmaps/IBM274 Makefile
$(generate-8bit-table)
-ibm275.h: ../localedata/charmaps/IBM275 Makefile
+$(objpfx)ibm275.h: ../localedata/charmaps/IBM275 Makefile
$(generate-8bit-table)
-ibm423.h: ../localedata/charmaps/IBM423 Makefile
+$(objpfx)ibm423.h: ../localedata/charmaps/IBM423 Makefile
$(generate-8bit-table)
-ibm500.h: ../localedata/charmaps/IBM500 Makefile
+$(objpfx)ibm500.h: ../localedata/charmaps/IBM500 Makefile
$(generate-8bit-table)
-ibm870.h: ../localedata/charmaps/IBM870 Makefile
+$(objpfx)ibm870.h: ../localedata/charmaps/IBM870 Makefile
$(generate-8bit-table)
-ibm871.h: ../localedata/charmaps/IBM871 Makefile
+$(objpfx)ibm871.h: ../localedata/charmaps/IBM871 Makefile
$(generate-8bit-table)
-ibm891.h: ../localedata/charmaps/IBM891 Makefile
+$(objpfx)ibm891.h: ../localedata/charmaps/IBM891 Makefile
$(generate-8bit-table)
-ibm903.h: ../localedata/charmaps/IBM903 Makefile
+$(objpfx)ibm903.h: ../localedata/charmaps/IBM903 Makefile
$(generate-8bit-table)
-ibm904.h: ../localedata/charmaps/IBM904 Makefile
+$(objpfx)ibm904.h: ../localedata/charmaps/IBM904 Makefile
$(generate-8bit-table)
-ibm905.h: ../localedata/charmaps/IBM905 Makefile
+$(objpfx)ibm905.h: ../localedata/charmaps/IBM905 Makefile
$(generate-8bit-table)
-ibm1047.h: ../localedata/charmaps/IBM1047 Makefile
+$(objpfx)ibm1047.h: ../localedata/charmaps/IBM1047 Makefile
$(generate-8bit-table)
ifneq ($(PERL),no)
-koi8-r.h: ../localedata/charmaps/KOI8-R Makefile
+$(objpfx)koi8-r.h: ../localedata/charmaps/KOI8-R Makefile
$(generate-8bit-gap-table)
-latin-greek.h: ../localedata/charmaps/LATIN-GREEK Makefile
+$(objpfx)latin-greek.h: ../localedata/charmaps/LATIN-GREEK Makefile
$(generate-8bit-gap-table)
-latin-greek-1.h: ../localedata/charmaps/LATIN-GREEK-1 Makefile
+$(objpfx)latin-greek-1.h: ../localedata/charmaps/LATIN-GREEK-1 Makefile
$(generate-8bit-gap-table)
-ibm256.h: ../localedata/charmaps/IBM256 Makefile
+$(objpfx)ibm256.h: ../localedata/charmaps/IBM256 Makefile
$(generate-8bit-gap-table)
-ibm273.h: ../localedata/charmaps/IBM273 Makefile
+$(objpfx)ibm273.h: ../localedata/charmaps/IBM273 Makefile
$(generate-8bit-gap-table)
-ibm277.h: ../localedata/charmaps/IBM277 Makefile
+$(objpfx)ibm277.h: ../localedata/charmaps/IBM277 Makefile
$(generate-8bit-gap-table)
-ibm278.h: ../localedata/charmaps/IBM278 Makefile
+$(objpfx)ibm278.h: ../localedata/charmaps/IBM278 Makefile
$(generate-8bit-gap-table)
-ibm280.h: ../localedata/charmaps/IBM280 Makefile
+$(objpfx)ibm280.h: ../localedata/charmaps/IBM280 Makefile
$(generate-8bit-gap-table)
-ibm281.h: ../localedata/charmaps/IBM281 Makefile
+$(objpfx)ibm281.h: ../localedata/charmaps/IBM281 Makefile
$(generate-8bit-gap-table)
-ibm284.h: ../localedata/charmaps/IBM284 Makefile
+$(objpfx)ibm284.h: ../localedata/charmaps/IBM284 Makefile
$(generate-8bit-gap-table)
-ibm285.h: ../localedata/charmaps/IBM285 Makefile
+$(objpfx)ibm285.h: ../localedata/charmaps/IBM285 Makefile
$(generate-8bit-gap-table)
-ibm290.h: ../localedata/charmaps/IBM290 Makefile
+$(objpfx)ibm290.h: ../localedata/charmaps/IBM290 Makefile
$(generate-8bit-gap-table)
-ibm297.h: ../localedata/charmaps/IBM297 Makefile
+$(objpfx)ibm297.h: ../localedata/charmaps/IBM297 Makefile
$(generate-8bit-gap-table)
-ibm420.h: ../localedata/charmaps/IBM420 Makefile
+$(objpfx)ibm420.h: ../localedata/charmaps/IBM420 Makefile
$(generate-8bit-gap-table)
-ibm424.h: ../localedata/charmaps/IBM424 Makefile
+$(objpfx)ibm424.h: ../localedata/charmaps/IBM424 Makefile
$(generate-8bit-gap-table)
-ibm437.h: ../localedata/charmaps/IBM437 Makefile
+$(objpfx)ibm437.h: ../localedata/charmaps/IBM437 Makefile
$(generate-8bit-gap-table)
-ibm850.h: ../localedata/charmaps/IBM850 Makefile
+$(objpfx)ibm850.h: ../localedata/charmaps/IBM850 Makefile
$(generate-8bit-gap-table)
-ibm851.h: ../localedata/charmaps/IBM851 Makefile
+$(objpfx)ibm851.h: ../localedata/charmaps/IBM851 Makefile
$(generate-8bit-gap-table)
-ibm852.h: ../localedata/charmaps/IBM852 Makefile
+$(objpfx)ibm852.h: ../localedata/charmaps/IBM852 Makefile
$(generate-8bit-gap-table)
-ibm855.h: ../localedata/charmaps/IBM855 Makefile
+$(objpfx)ibm855.h: ../localedata/charmaps/IBM855 Makefile
$(generate-8bit-gap-table)
-ibm857.h: ../localedata/charmaps/IBM857 Makefile
+$(objpfx)ibm857.h: ../localedata/charmaps/IBM857 Makefile
$(generate-8bit-gap-table)
-ibm860.h: ../localedata/charmaps/IBM860 Makefile
+$(objpfx)ibm860.h: ../localedata/charmaps/IBM860 Makefile
$(generate-8bit-gap-table)
-ibm861.h: ../localedata/charmaps/IBM861 Makefile
+$(objpfx)ibm861.h: ../localedata/charmaps/IBM861 Makefile
$(generate-8bit-gap-table)
-ibm862.h: ../localedata/charmaps/IBM862 Makefile
+$(objpfx)ibm862.h: ../localedata/charmaps/IBM862 Makefile
$(generate-8bit-gap-table)
-ibm863.h: ../localedata/charmaps/IBM863 Makefile
+$(objpfx)ibm863.h: ../localedata/charmaps/IBM863 Makefile
$(generate-8bit-gap-table)
-ibm864.h: ../localedata/charmaps/IBM864 Makefile
+$(objpfx)ibm864.h: ../localedata/charmaps/IBM864 Makefile
$(generate-8bit-gap-table)
-ibm865.h: ../localedata/charmaps/IBM865 Makefile
+$(objpfx)ibm865.h: ../localedata/charmaps/IBM865 Makefile
$(generate-8bit-gap-table)
-ibm868.h: ../localedata/charmaps/IBM868 Makefile
+$(objpfx)ibm868.h: ../localedata/charmaps/IBM868 Makefile
$(generate-8bit-gap-table)
-ibm869.h: ../localedata/charmaps/IBM869 Makefile
+$(objpfx)ibm869.h: ../localedata/charmaps/IBM869 Makefile
$(generate-8bit-gap-table)
-ibm875.h: ../localedata/charmaps/IBM875 Makefile
+$(objpfx)ibm875.h: ../localedata/charmaps/IBM875 Makefile
$(generate-8bit-gap-table)
-ibm880.h: ../localedata/charmaps/IBM880 Makefile
+$(objpfx)ibm880.h: ../localedata/charmaps/IBM880 Makefile
$(generate-8bit-gap-table)
-ibm918.h: ../localedata/charmaps/IBM918 Makefile
+$(objpfx)ibm918.h: ../localedata/charmaps/IBM918 Makefile
$(generate-8bit-gap-table)
-ibm1004.h: ../localedata/charmaps/IBM1004 Makefile
+$(objpfx)ibm1004.h: ../localedata/charmaps/IBM1004 Makefile
$(generate-8bit-gap-table)
-ibm1026.h: ../localedata/charmaps/IBM1026 Makefile
+$(objpfx)ibm1026.h: ../localedata/charmaps/IBM1026 Makefile
$(generate-8bit-gap-table)
-cp1250.h: ../localedata/charmaps/CP1250 Makefile
+$(objpfx)cp1250.h: ../localedata/charmaps/CP1250 Makefile
$(generate-8bit-gap-table)
-cp1251.h: ../localedata/charmaps/CP1251 Makefile
+$(objpfx)cp1251.h: ../localedata/charmaps/CP1251 Makefile
$(generate-8bit-gap-table)
-cp1252.h: ../localedata/charmaps/CP1252 Makefile
+$(objpfx)cp1252.h: ../localedata/charmaps/CP1252 Makefile
$(generate-8bit-gap-table)
-cp1253.h: ../localedata/charmaps/CP1253 Makefile
+$(objpfx)cp1253.h: ../localedata/charmaps/CP1253 Makefile
$(generate-8bit-gap-table)
-cp1254.h: ../localedata/charmaps/CP1254 Makefile
+$(objpfx)cp1254.h: ../localedata/charmaps/CP1254 Makefile
$(generate-8bit-gap-table)
-cp1255.h: ../localedata/charmaps/CP1255 Makefile
+$(objpfx)cp1255.h: ../localedata/charmaps/CP1255 Makefile
$(generate-8bit-gap-table)
-cp1256.h: ../localedata/charmaps/CP1256 Makefile
+$(objpfx)cp1256.h: ../localedata/charmaps/CP1256 Makefile
$(generate-8bit-gap-table)
-cp1257.h: ../localedata/charmaps/CP1257 Makefile
+$(objpfx)cp1257.h: ../localedata/charmaps/CP1257 Makefile
$(generate-8bit-gap-table)
endif
-headers: $(sed-generated-headers) $(perl-generated-headers)
+headers: $(addprefix $(objpfx),$(sed-generated-headers)) \
+ $(addprefix $(objpfx),$(perl-generated-headers))
$(addprefix $(inst_gconvdir)/, $(modules.so)): \
diff --git a/locale/iso-4217.def b/locale/iso-4217.def
index 5d01def..bd77763 100644
--- a/locale/iso-4217.def
+++ b/locale/iso-4217.def
@@ -12,32 +12,36 @@ DEFINE_INT_CURR("AFA ") /* Afghanistan Afgani */
DEFINE_INT_CURR("ALL ") /* Albanian Lek */
DEFINE_INT_CURR("AMD ") /* Armenia Dram */
DEFINE_INT_CURR("ANG ") /* Netherlands Antilles */
-DEFINE_INT_CURR("AOK ") /* Angolan Kwanza */
+DEFINE_INT_CURR("AOK ") /* Angolan Kwanza */ /* obsolete */
DEFINE_INT_CURR("AON ") /* Angolan New Kwanza */
-DEFINE_INT_CURR("ARP ") /* Argentine Peso */
+DEFINE_INT_CURR("ARS ") /* Argentine Peso */
DEFINE_INT_CURR("ATS ") /* Austrian Schilling */
DEFINE_INT_CURR("AUD ") /* Australian Dollar */
+DEFINE_INT_CURR("AWG ") /* Aruba Guilder */
DEFINE_INT_CURR("AZM ") /* Azerbaijan Manat */
+DEFINE_INT_CURR("BAD ") /* Bosnian Dinar */
DEFINE_INT_CURR("BBD ") /* Barbados Dollar */
DEFINE_INT_CURR("BDT ") /* Bangladesh Taka */
DEFINE_INT_CURR("BEF ") /* Belgian Franc */
DEFINE_INT_CURR("BGL ") /* Bulgarian Lev */
DEFINE_INT_CURR("BHD ") /* Bahraini Dinar */
-DEFINE_INT_CURR("BIF ") /* Burundi */
+DEFINE_INT_CURR("BIF ") /* Burundi Franc */
DEFINE_INT_CURR("BMD ") /* Burmudian Dollar */
DEFINE_INT_CURR("BND ") /* Brunei Dollar */
-DEFINE_INT_CURR("BOP ") /* Bolivian Boliviano */
-DEFINE_INT_CURR("BPS ") /* Canton and Enderbury Islands */
-DEFINE_INT_CURR("BRC ") /* Brazil Real */
+DEFINE_INT_CURR("BOB ") /* Bolivian Boliviano */
+DEFINE_INT_CURR("BPS ") /* Canton and Enderbury Islands */ /* ?? */
+DEFINE_INT_CURR("BRE ") /* Brazil Real */ /* obsolete */
DEFINE_INT_CURR("BRL ") /* Brazil Cruzeiro */
-DEFINE_INT_CURR("BRR ") /* Brazil Real */
+DEFINE_INT_CURR("BRR ") /* Brazil Real */ /* obsolete */
DEFINE_INT_CURR("BSD ") /* Bahamas Dollar */
DEFINE_INT_CURR("BTN ") /* Bhutan Ngultrum */
-DEFINE_INT_CURR("BUK ") /* Burma */
+DEFINE_INT_CURR("BUK ") /* Burma */ /* obsolete */
DEFINE_INT_CURR("BWP ") /* Botswana Pula */
+DEFINE_INT_CURR("BYB ") /* Belarus Ruble */
DEFINE_INT_CURR("BZD ") /* Belize Dollar */
DEFINE_INT_CURR("CAD ") /* Canadian Dollar */
-DEFINE_INT_CURR("CFP ") /* French Pacific Island Franc */
+DEFINE_INT_CURR("CDF ") /* Congo Dem.Rep. Franc */
+DEFINE_INT_CURR("CFP ") /* French Pacific Island Franc */ /* ??*/
DEFINE_INT_CURR("CHF ") /* Swiss Franc (Liechtenstein) */
DEFINE_INT_CURR("CLP ") /* Chilean Peso */
DEFINE_INT_CURR("CNY ") /* China Yuan Renminbi */
@@ -55,6 +59,7 @@ DEFINE_INT_CURR("DZD ") /* Algerian Dinar */
DEFINE_INT_CURR("ECS ") /* Ecuadoran Sucre */
DEFINE_INT_CURR("EEK ") /* Estonian Kroon */
DEFINE_INT_CURR("EGP ") /* Egyptian Pound */
+DEFINE_INT_CURR("ERB ") /* Eritrean Birr */
DEFINE_INT_CURR("ESP ") /* Spanish Peseta */
DEFINE_INT_CURR("ETB ") /* Ethiopian Birr */
DEFINE_INT_CURR("EUR ") /* European Union Euro */
@@ -63,10 +68,11 @@ DEFINE_INT_CURR("FJD ") /* Fiji Dollar */
DEFINE_INT_CURR("FKP ") /* Falkland Islands Pound (Malvinas) */
DEFINE_INT_CURR("FRF ") /* French Franc */
DEFINE_INT_CURR("GBP ") /* British Pound */
-DEFINE_INT_CURR("GEK ") /* Georgia Lari */
+DEFINE_INT_CURR("GEL ") /* Georgia Lari */
DEFINE_INT_CURR("GHC ") /* Ghana Cedi */
DEFINE_INT_CURR("GIP ") /* Gibraltar Pound */
DEFINE_INT_CURR("GMD ") /* Gambian Dalasi */
+DEFINE_INT_CURR("GNF ") /* Guinea Franc */
DEFINE_INT_CURR("GNS ") /* Guinea Syli */
DEFINE_INT_CURR("GQE ") /* Equatorial Guinea Ekwele */
DEFINE_INT_CURR("GRD ") /* Greek Drachma */
@@ -102,7 +108,7 @@ DEFINE_INT_CURR("LAK ") /* Lao People's Democratic Republic New Kip */
DEFINE_INT_CURR("LBP ") /* Lebanese Pound */
DEFINE_INT_CURR("LKR ") /* Sri Lankan Rupee */
DEFINE_INT_CURR("LRD ") /* Liberian Dollar */
-DEFINE_INT_CURR("LSM ") /* Lesotho Maloti */
+DEFINE_INT_CURR("LSL ") /* Lesotho Maloti */
DEFINE_INT_CURR("LTL ") /* Lithuanian Litas */
DEFINE_INT_CURR("LUF ") /* Luxembourg Franc */
DEFINE_INT_CURR("LVL ") /* Latvia Lat */
@@ -110,12 +116,13 @@ DEFINE_INT_CURR("LYD ") /* Libyan Arab Jamahiriya Dinar */
DEFINE_INT_CURR("MAD ") /* Moroccan Dirham */
DEFINE_INT_CURR("MDL ") /* Moldova Lei */
DEFINE_INT_CURR("MGF ") /* Madagasy Franc */
+DEFINE_INT_CURR("MKD ") /* Macedonia Denar */
DEFINE_INT_CURR("MLF ") /* Mali Franc */
DEFINE_INT_CURR("MMK ") /* Myanmar Kyat */
DEFINE_INT_CURR("MNT ") /* Mongolia Tugrik */
DEFINE_INT_CURR("MOP ") /* Macau Pataca */
DEFINE_INT_CURR("MRO ") /* Mauritania Ouguiya */
-DEFINE_INT_CURR("MTP ") /* Maltese Lira */
+DEFINE_INT_CURR("MTL ") /* Maltese Lira */
DEFINE_INT_CURR("MUR ") /* Mauritius Rupee */
DEFINE_INT_CURR("MVR ") /* Maldives Rupee */
DEFINE_INT_CURR("MWK ") /* Malawi Kwacha */
@@ -154,24 +161,27 @@ DEFINE_INT_CURR("SLL ") /* Sierra Leone Leone */
DEFINE_INT_CURR("SOS ") /* Somalia Schilling */
DEFINE_INT_CURR("SRG ") /* Suriname Guilder */
DEFINE_INT_CURR("STD ") /* Sao Tome and Principe Dobra */
-DEFINE_INT_CURR("SUR ") /* Soviet Union Rubel (Ukrainian, Byelorussion) */
+DEFINE_INT_CURR("SUR ") /* Soviet Union Rubel (Ukrainian, Byelorussion) */ /* ??*/
DEFINE_INT_CURR("SVC ") /* El Salvador Colon */
DEFINE_INT_CURR("SYP ") /* Syrian Arab Republic Pound */
DEFINE_INT_CURR("SZL ") /* Swaziland Lilangeni */
DEFINE_INT_CURR("THB ") /* Thai Baht */
+DEFINE_INT_CURR("TJR ") /* Tajikistani Ruble */
DEFINE_INT_CURR("TMM ") /* Turkmenistan Manet */
DEFINE_INT_CURR("TND ") /* Tunisian Dinar */
DEFINE_INT_CURR("TOP ") /* Tonga Pa'Anga */
-DEFINE_INT_CURR("TPE ") /* East Timor Escudo */
+DEFINE_INT_CURR("TPE ") /* East Timor Escudo */ /* ??? */
DEFINE_INT_CURR("TRL ") /* Turkish Lira */
DEFINE_INT_CURR("TTD ") /* Trinidad and Tobago */
DEFINE_INT_CURR("TWD ") /* Taiwan, Province of China Dollar */
DEFINE_INT_CURR("TZS ") /* United Republic of Tanzania Shilling */
-DEFINE_INT_CURR("UAK ") /* Ukraine Hryvna */
-DEFINE_INT_CURR("UGS ") /* Ugandan Shilling */
+DEFINE_INT_CURR("UAH ") /* Ukraine Hryvna */
+DEFINE_INT_CURR("UGS ") /* Ugandan Shilling */ /* obsolete */
+DEFINE_INT_CURR("UGX ") /* Ugandan Shilling */
DEFINE_INT_CURR("USD ") /* United States Dollar */
-DEFINE_INT_CURR("UYP ") /* Uruguay Peso */
-DEFINE_INT_CURR("UYU ") /* Uruguay New Peso */
+DEFINE_INT_CURR("UYN ") /* Uruguay New Peso */ /* obsolete */
+DEFINE_INT_CURR("UYP ") /* Uruguay Peso */ /* obsolete */
+DEFINE_INT_CURR("UYU ") /* Uruguay Peso Uruguayo */
DEFINE_INT_CURR("UZS ") /* Uzbekistan Sum */
DEFINE_INT_CURR("VEB ") /* Venezuelan Bolivar */
DEFINE_INT_CURR("VND ") /* Viet Nam Dong */
@@ -179,12 +189,14 @@ DEFINE_INT_CURR("VUV ") /* Vanuatu Vatu */
DEFINE_INT_CURR("WST ") /* Samoa Tala */
DEFINE_INT_CURR("XAF ") /* Central African Franc (United Republic of Cameroon, Central African Republic, Chad, Congo, Gabon) */
DEFINE_INT_CURR("XCD ") /* East Caribbean Dollar (Antiqua, Dominica, Grenada, Montserrat, St. Kitts-Nevis-Anguilla, Saint Lucia, Saint Vincent and the Grenadines) */
-DEFINE_INT_CURR("XDS ") /* St. Christopher Dollar */
+DEFINE_INT_CURR("XDR ") /* International Monetary Fund */
+DEFINE_INT_CURR("XDS ") /* St. Christopher Dollar */ /* ?? */
DEFINE_INT_CURR("XOF ") /* West African Franc (Benin, Ivory Coast, Niger, Senegal, Togo, Upper Volta) */
DEFINE_INT_CURR("XPF ") /* French polynesia, New Caledonia, Wallis and Futuna Islands */
-DEFINE_INT_CURR("YDD ") /* Yemini Dinar (Democratic Yemen) */
+DEFINE_INT_CURR("YDD ") /* Yemini Dinar (Democratic Yemen) */ /* obsolete */
DEFINE_INT_CURR("YER ") /* Yemeni Rial */
+DEFINE_INT_CURR("YUN ") /* Yugoslavian New Dinar */
DEFINE_INT_CURR("ZAR ") /* South Africa Rand (Lesotho, Namibia) */
DEFINE_INT_CURR("ZMK ") /* Zambian Kwacha */
-DEFINE_INT_CURR("ZRZ ") /* Zaire Zaire */
+DEFINE_INT_CURR("ZRN ") /* Zaire New Zaire */ /* obsolete */
DEFINE_INT_CURR("ZWD ") /* Zimbabwe Dollar */