diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-05-21 20:19:54 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-05-21 20:19:54 +0000 |
| commit | 3b43494000bba0633fccbb481c77825927ebb8fb (patch) | |
| tree | a49c146c4cebb1b2e502deb0997371aafc668db7 /locale | |
| parent | 0efb48a1dfd132138a44c238b6e7f67a185a360e (diff) | |
| download | glibc-3b43494000bba0633fccbb481c77825927ebb8fb.zip glibc-3b43494000bba0633fccbb481c77825927ebb8fb.tar.gz glibc-3b43494000bba0633fccbb481c77825927ebb8fb.tar.bz2 | |
Update.
* locale/locale.h (struct lconv): Add new elements from ISO C99.
* locale/localeconv.c: Initialize new elements from ISO C99.
* iconv/iconv_prog.c (process_block): Remove const from second
parameter.
(main): Remove const from addr definition.
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/locale.h | 18 | ||||
| -rw-r--r-- | locale/localeconv.c | 8 |
2 files changed, 24 insertions, 2 deletions
diff --git a/locale/locale.h b/locale/locale.h index 8942d28..768d2b6 100644 --- a/locale/locale.h +++ b/locale/locale.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 95, 96, 97, 98, 99 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,95,96,97,98,99,2000 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -90,6 +90,22 @@ struct lconv 4 The sign string immediately follows the currency_symbol. */ char p_sign_posn; char n_sign_posn; + /* 1 if int_curr_symbol precedes a positive value, 0 if succeeds. */ + char int_p_cs_precedes; + /* 1 iff a space separates int_curr_symbol from a positive value. */ + char int_p_sep_by_space; + /* 1 if int_curr_symbol precedes a negative value, 0 if succeeds. */ + char int_n_cs_precedes; + /* 1 iff a space separates int_curr_symbol from a negative value. */ + char int_n_sep_by_space; + /* Positive and negative sign positions: + 0 Parentheses surround the quantity and int_curr_symbol. + 1 The sign string precedes the quantity and int_curr_symbol. + 2 The sign string follows the quantity and int_curr_symbol. + 3 The sign string immediately precedes the int_curr_symbol. + 4 The sign string immediately follows the int_curr_symbol. */ + char int_p_sign_posn; + char int_n_sign_posn; }; diff --git a/locale/localeconv.c b/locale/localeconv.c index 14c6102..79a88ac 100644 --- a/locale/localeconv.c +++ b/locale/localeconv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1995, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 95, 97, 99, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -47,6 +47,12 @@ localeconv (void) result.n_sep_by_space = *(char *) _NL_CURRENT (LC_MONETARY, N_SEP_BY_SPACE); result.p_sign_posn = *(char *) _NL_CURRENT (LC_MONETARY, P_SIGN_POSN); result.n_sign_posn = *(char *) _NL_CURRENT (LC_MONETARY, N_SIGN_POSN); + result.p_cs_precedes = *(char *) _NL_CURRENT (LC_MONETARY, INT_P_CS_PRECEDES); + result.p_sep_by_space = *(char *) _NL_CURRENT (LC_MONETARY, INT_P_SEP_BY_SPACE); + result.n_cs_precedes = *(char *) _NL_CURRENT (LC_MONETARY, INT_N_CS_PRECEDES); + result.n_sep_by_space = *(char *) _NL_CURRENT (LC_MONETARY, INT_N_SEP_BY_SPACE); + result.p_sign_posn = *(char *) _NL_CURRENT (LC_MONETARY, INT_P_SIGN_POSN); + result.n_sign_posn = *(char *) _NL_CURRENT (LC_MONETARY, INT_N_SIGN_POSN); return &result; } |