diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | localedata/ChangeLog | 4 | ||||
| -rw-r--r-- | localedata/locales/en_NG | 289 | ||||
| -rw-r--r-- | misc/bits/error.h | 2 | ||||
| -rw-r--r-- | misc/error.h | 27 |
5 files changed, 309 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog index c9dd4b3540..e4ad3c8a90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-04 Ulrich Drepper <drepper@redhat.com> + + * misc/error.h: Remove support for use outside of libc. We have to + include <features.h> now. Include <bits/error.h> if possible. + * misc/bits/error.h: New file. + 2007-10-03 Jakub Jelinek * string/bits/string3.h (memcpy, memmove, mempcpy, memset, bcopy, diff --git a/localedata/ChangeLog b/localedata/ChangeLog index ee07a8bee9..de2b138438 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,7 @@ +2007-10-04 Ulrich Drepper <drepper@redhat.com> + + * locales/en_NG: New file. + 2007-10-04 Jakub Jelinek <jakub@redhat.com> * tst-langinfo.sh: Update expected THOUSEP for fr_FR. diff --git a/localedata/locales/en_NG b/localedata/locales/en_NG new file mode 100644 index 0000000000..569283b906 --- /dev/null +++ b/localedata/locales/en_NG @@ -0,0 +1,289 @@ +escape_char / +comment_char % + +% English language locale for Nigeria +% Language: en +% Territory: NG +% Revision: 0.2 +% Date: 2006-02-01 +% Users: general +% Charset: UTF-8 +% Distribution and use is free, also +% for commercial purposes. +% +% adapted from en_ZA; should be checked and verified + +LC_IDENTIFICATION +title "English locale for Nigeria" +source "" +address "" +contact "" +email "" +tel "" +fax "" +language "English" +territory "Nigeria" +revision "0.2" +date "2006-02-01" +% +category "en_NG:2003";LC_IDENTIFICATION +category "en_NG:2000";LC_CTYPE +category "en_NG:2000";LC_COLLATE +category "en_NG:2003";LC_TIME +category "en_NG:2000";LC_NUMERIC +category "en_NG:2000";LC_MONETARY +category "en_NG:2003";LC_MESSAGES +category "en_NG:2000";LC_PAPER +category "en_NG:2000";LC_MEASUREMENT +category "en_NG:2003";LC_NAME +category "en_NG:2003";LC_ADDRESS +category "en_NG:2003";LC_TELEPHONE + +END LC_IDENTIFICATION + +LC_CTYPE +copy "i18n" + +translit_start +include "translit_combining";"" +translit_end +END LC_CTYPE + +LC_COLLATE +copy "iso14651_t1" +END LC_COLLATE + +% FIXME +LC_MONETARY +% "NGN " +int_curr_symbol "<U004E><U0047><U004E><U0020>" +% "₦" +currency_symbol "<U20A6>" +% "." +mon_decimal_point "<U002E>" +% "," +mon_thousands_sep "<U002C>" +mon_grouping 3;3 +positive_sign "" +% "-" +negative_sign "<U002D>" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 1 +p_sep_by_space 0 +n_cs_precedes 1 +n_sep_by_space 0 +p_sign_posn 1 +n_sign_posn 1 +END LC_MONETARY + +% FIXME +LC_NUMERIC +% "." +decimal_point "<U002E>" +% "," +thousands_sep "<U002C>" +grouping 3;3 +END LC_NUMERIC + +LC_TIME +% abday - The abbreviations for the week days: +% - Sun, Mon, Tue, Wed, Thu, Fri, Sat +abday "<U0053><U0075><U006E>";"<U004D><U006F><U006E>";/ + "<U0054><U0075><U0065>";"<U0057><U0065><U0064>";/ + "<U0054><U0068><U0075>";"<U0046><U0072><U0069>";/ + "<U0053><U0061><U0074>" + +% day - The full names of the week days: +% - Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday +day "<U0053><U0075><U006E><U0064><U0061><U0079>";/ + "<U004D><U006F><U006E><U0064><U0061><U0079>";/ + "<U0054><U0075><U0065><U0073><U0064><U0061><U0079>";/ + "<U0057><U0065><U0064><U006E><U0065><U0073><U0064><U0061><U0079>";/ + "<U0054><U0068><U0075><U0072><U0073><U0064><U0061><U0079>";/ + "<U0046><U0072><U0069><U0064><U0061><U0079>";/ + "<U0053><U0061><U0074><U0075><U0072><U0064><U0061><U0079>" + +% abmon - The abbreviations for the months +% - Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec +abmon "<U004A><U0061><U006E>";"<U0046><U0065><U0062>";/ + "<U004D><U0061><U0072>";"<U0041><U0070><U0072>";/ + "<U004D><U0061><U0079>";"<U004A><U0075><U006E>";/ + "<U004A><U0075><U006C>";"<U0041><U0075><U0067>";/ + "<U0053><U0065><U0070>";"<U004F><U0063><U0074>";/ + "<U004E><U006F><U0076>";"<U0044><U0065><U0063>" + +% mon - The full names of the months - +% - January, February, March, April, May, June +% July, August, September, October, November, December +mon "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/ + "<U0046><U0065><U0062><U0072><U0075><U0061><U0072><U0079>";/ + "<U004D><U0061><U0072><U0063><U0068>";/ + "<U0041><U0070><U0072><U0069><U006C>";/ + "<U004D><U0061><U0079>";/ + "<U004A><U0075><U006E><U0065>";/ + "<U004A><U0075><U006C><U0079>";/ + "<U0041><U0075><U0067><U0075><U0073><U0074>";/ + "<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";/ + "<U004F><U0063><U0074><U006F><U0062><U0065><U0072>";/ + "<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/ + "<U0044><U0065><U0063><U0065><U006D><U0062><U0065><U0072>" + +% Abreviated date and time representation to be referenced by the "%c" field descriptor - +% +% "%a" (short weekday name), +% "%d" (day of month as a decimal number), +% "%b" (short month name), +% "%Y" (year with century as a decimal number), +% "%T" (24-hour clock time in format HH:MM:SS), +% "%Z" (Time zone name) +d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>" + +% Date representation to be referenced by the "%x" field descriptor - +% "%d/%m/%Y", day/month/year as decimal numbers (01/01/2000). +d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0059>" + +% Time representation to be referenced by the "%X" field descriptor - +% "%T" (24-hour clock time in format HH:MM:SS) +t_fmt "<U0025><U0054>" + +% Define representation of ante meridiem and post meridiem strings - +% The "" mean default to "AM" and "PM". +am_pm "";"" + +% Define time representation in 12-hour format with "am_pm", to be referenced by the "%r" +% The "" means that this format is not supported. +t_fmt_ampm "" + +% Date representation not described in ISO/IEC 14652. Comes out as - +% "%a %b %e %H:%M:%S %Z %Y" which is default "date" command output +% +% %a - abbreviated weekday name, +% %b - abreviated month name, +% %e - day of month as a decimal number with leading space (1 to 31), +% %H - hour (24-hour clock) as a decimal number (00 to 23), +% %M - minute as a decimal number (00 to 59), +% %S - seconds as a decimal number (00 to 59), +% %Z - time-zone name, +% %Y - year with century as a decimal number,e.g. 2001. +date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ +<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ +<U0025><U005A><U0020><U0025><U0059>" +END LC_TIME + +LC_MESSAGES +% The affirmative response - +% "^[yY]" +yesexpr "<U005E><U005B><U0079><U0059><U005D>" + +% The negative response - +% "^[nN]" +noexpr "<U005E><U005B><U006E><U004E><U005D>" +END LC_MESSAGES + +LC_PAPER +copy "en_DK" +END LC_PAPER + +% FIXME +LC_TELEPHONE +% Representation of telephone number for international use - +% "+%c %a %l", which is +% "+%c - country code", +% "%a - area code without the prefix (often 0)", +% "%l local number". +tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ +<U006C>" + +% Represntation of telephone number for domestic use - +% "(%A) %l", which is +% %A - area code with national prefix +% %l - local number". +tel_dom_fmt "<U0028><U0025><U0041><U0029><U0020><U0025><U006C>" + +% Prefix for making international calls +% "009" +int_select "<U0030><U0030><U0039>" + +% International dialing code +% "234" +int_prefix "<U0032><U0033><U0034>" +END LC_TELEPHONE + +LC_MEASUREMENT +copy "en_DK" +END LC_MEASUREMENT + +LC_NAME +copy "en_DK" +END LC_NAME + +% FIXME +LC_ADDRESS +% Representation of postal addresses (minus the addressee's name) in South +% Africa. (Ignored for now) +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% +% "firm name", +% "end of line", +% "C/O address", +% "end of line", +% "department name", +% "Building name", +% "end of line", +% "street or block name", +% "space", +% "house number or designation", +% "space", +% "floor number", +% "space", +% "room number, door designation", +% "end of line", +% "postal code", +% "space", +% "town, city", +% "end of line", +% "country designation for the <country_post> keyword", +% "end of line +postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/ +<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/ +<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/ +<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/ +<U004E><U0025><U0063><U0025><U004E>" + +% Country name in English - "Nigeria" +country_name "<U004E><U0069><U0067><U0065><U0072><U0069><U0061>" + +% Language name in English - "English" +lang_name "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>" + +% CEPT MAILCODES are suggested +% Alternatively use the code found on your countries postal item tracking number +% "NG"? +%country_post "<U004E><U0047>" + +% UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic +% http://www.unece.org/trans/conventn/Distsigns_Sept2003.pdf +% "WAN" +country_car "<U0057><U0041><U004E>" + +% ISO 2108 +% http://www.isbn-international.org/ +country_isbn 978 + +% ISO 639 language abbreviations: +% 639-1 2 letter, 639-2 3 letter terminology +% http://www.loc.gov/standards/iso639-2/englagn.html +% "en", "eng" +lang_ab "<U0065><U006E>" +lang_term "<U0065><U006E><U0067>" +lang_lib "<U0065><U006E><U0067>" + +% ISO 3166 country number and 2 and 3 letter abreviations +% http://www.unicode.org/onlinedat/countries.html +% "NG", "NGA" +country_ab2 "<U004E><U0047>" +country_ab3 "<U004E><U0047><U0041>" +country_num 566 + +END LC_ADDRESS diff --git a/misc/bits/error.h b/misc/bits/error.h index 7089768c3b..aafed58e7d 100644 --- a/misc/bits/error.h +++ b/misc/bits/error.h @@ -18,7 +18,7 @@ 02111-1307 USA. */ #ifndef _ERROR_H -# error "Never include <bits/error2.h> directly; use <error.h> instead." +# error "Never include <bits/error.h> directly; use <error.h> instead." #endif diff --git a/misc/error.h b/misc/error.h index f25005b0e8..ce99a941d2 100644 --- a/misc/error.h +++ b/misc/error.h @@ -1,5 +1,5 @@ /* Declaration for error-reporting function - Copyright (C) 1995, 1996, 1997, 2003, 2006 Free Software Foundation, Inc. + Copyright (C) 1995,1996,1997,2003,2006,2007 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 @@ -20,22 +20,10 @@ #ifndef _ERROR_H #define _ERROR_H 1 -#ifndef __attribute__ -/* This feature is available in gcc versions 2.5 and later. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__ -# define __attribute__(Spec) /* empty */ -# endif -/* The __-protected variants of `format' and `printf' attributes - are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) -# define __format__ format -# define __printf__ printf -# endif -#endif +#include <features.h> -#ifdef __cplusplus -extern "C" { -#endif + +__BEGIN_DECLS /* Print a message with `fprintf (stderr, FORMAT, ...)'; if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM). @@ -60,8 +48,11 @@ extern unsigned int error_message_count; variable controls whether this mode is selected or not. */ extern int error_one_per_line; -#ifdef __cplusplus -} + +#if defined __extern_always_inline && defined __va_arg_pack +# include <bits/error.h> #endif +__END_DECLS + #endif /* error.h */ |