diff options
| -rw-r--r-- | ChangeLog | 23 | ||||
| -rw-r--r-- | include/dlfcn.h | 3 | ||||
| -rw-r--r-- | libio/iolibio.h | 55 | ||||
| -rw-r--r-- | libio/libioP.h | 49 | ||||
| -rw-r--r-- | localedata/ChangeLog | 5 | ||||
| -rw-r--r-- | localedata/locales/pa_IN | 58 |
6 files changed, 107 insertions, 86 deletions
diff --git a/ChangeLog b/ChangeLog index 85f6ef52a2..f21cfaad2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2004-11-27 Ulrich Drepper <drepper@redhat.com> + + * include/dlfcn.h (__libc_dlopen): Add __RTLD_DLOPEN to the mode + parameter. Reported by VY Newsum <newsum@fel.tno.nl>. + +2004-11-10 Daniel Jacobowitz <dan@debian.org> + + * libio/iolibio.h (_IO_fclose, _IO_new_fclose, _IO_old_fclose, + _IO_fflush, _IO_fgetpos, _IO_fgetpos64, _IO_fgets, _IO_fopen, + _IO_old_fopen, _IO_new_fopen, _IO_fopen64, __fopen_internal, + _IO_fprintf, _IO_fputs, _IO_fsetpos, _IO_fsetpos64, _IO_ftell, + _IO_fread, _IO_fwrite, _IO_gets, _IO_printf, _IO_puts, _IO_scanf, + _IO_fflush_internal, _IO_ftell_internal, _IO_fputs_internal) + _IO_fwrite_internal): Remove incorrect __THROW. + * libio/libioP.h (_IO_default_xsputn, _IO_wdefault_xsputn, + _IO_default_xsgetn, _IO_wdefault_xsgetn, _IO_default_write, + _IO_default_read, _IO_getline, _IO_getline_info, _IO_getwline, + _IO_getwline_info, _IO_file_read_internal, _IO_sgetn_internal, + _IO_wdo_write_internal, _IO_do_write_internal, + _IO_getline_info_internal, _IO_getline_internal, + _IO_vfprintf_internal, _IO_putc_internal, _IO_read, _IO_write, + _IO_close): Likewise. + 2004-11-26 Jakub Jelinek <jakub@redhat.com> * posix/Makefile (install-others): Add $(inst_libexecdir)/getconf. diff --git a/include/dlfcn.h b/include/dlfcn.h index 3ff855a367..bfa1b9041b 100644 --- a/include/dlfcn.h +++ b/include/dlfcn.h @@ -12,7 +12,8 @@ /* Now define the internal interfaces. */ -#define __libc_dlopen(name) __libc_dlopen_mode (name, RTLD_LAZY) +#define __libc_dlopen(name) \ + __libc_dlopen_mode (name, RTLD_LAZY | __RTLD_DLOPEN) extern void *__libc_dlopen_mode (__const char *__name, int __mode); extern void *__libc_dlsym (void *__map, __const char *__name); extern int __libc_dlclose (void *__map); diff --git a/libio/iolibio.h b/libio/iolibio.h index 4b914fc02e..00a4f56c50 100644 --- a/libio/iolibio.h +++ b/libio/iolibio.h @@ -7,36 +7,35 @@ extern "C" { #endif -extern int _IO_fclose (_IO_FILE*) __THROW; -extern int _IO_new_fclose (_IO_FILE*) __THROW; -extern int _IO_old_fclose (_IO_FILE*) __THROW; +extern int _IO_fclose (_IO_FILE*); +extern int _IO_new_fclose (_IO_FILE*); +extern int _IO_old_fclose (_IO_FILE*); extern _IO_FILE *_IO_fdopen (int, const char*) __THROW; extern _IO_FILE *_IO_old_fdopen (int, const char*) __THROW; extern _IO_FILE *_IO_new_fdopen (int, const char*) __THROW; -extern int _IO_fflush (_IO_FILE*) __THROW; -extern int _IO_fgetpos (_IO_FILE*, _IO_fpos_t*) __THROW; -extern int _IO_fgetpos64 (_IO_FILE*, _IO_fpos64_t*) __THROW; -extern char* _IO_fgets (char*, int, _IO_FILE*) __THROW; -extern _IO_FILE *_IO_fopen (const char*, const char*) __THROW; -extern _IO_FILE *_IO_old_fopen (const char*, const char*) __THROW; -extern _IO_FILE *_IO_new_fopen (const char*, const char*) __THROW; -extern _IO_FILE *_IO_fopen64 (const char*, const char*) __THROW; -extern _IO_FILE *__fopen_internal (const char*, const char*, int) __THROW; +extern int _IO_fflush (_IO_FILE*); +extern int _IO_fgetpos (_IO_FILE*, _IO_fpos_t*); +extern int _IO_fgetpos64 (_IO_FILE*, _IO_fpos64_t*); +extern char* _IO_fgets (char*, int, _IO_FILE*); +extern _IO_FILE *_IO_fopen (const char*, const char*); +extern _IO_FILE *_IO_old_fopen (const char*, const char*); +extern _IO_FILE *_IO_new_fopen (const char*, const char*); +extern _IO_FILE *_IO_fopen64 (const char*, const char*); +extern _IO_FILE *__fopen_internal (const char*, const char*, int); extern _IO_FILE *__fopen_maybe_mmap (_IO_FILE *) __THROW; -extern int _IO_fprintf (_IO_FILE*, const char*, ...) __THROW; -extern int _IO_fputs (const char*, _IO_FILE*) __THROW; +extern int _IO_fprintf (_IO_FILE*, const char*, ...); +extern int _IO_fputs (const char*, _IO_FILE*); libc_hidden_proto (_IO_fputs) -extern int _IO_fsetpos (_IO_FILE*, const _IO_fpos_t *) __THROW; -extern int _IO_fsetpos64 (_IO_FILE*, const _IO_fpos64_t *) __THROW; -extern long int _IO_ftell (_IO_FILE*) __THROW; -extern _IO_size_t _IO_fread (void*, _IO_size_t, _IO_size_t, _IO_FILE*) __THROW; -extern _IO_size_t _IO_fwrite (const void*, _IO_size_t, _IO_size_t, _IO_FILE*) - __THROW; -extern char* _IO_gets (char*) __THROW; +extern int _IO_fsetpos (_IO_FILE*, const _IO_fpos_t *); +extern int _IO_fsetpos64 (_IO_FILE*, const _IO_fpos64_t *); +extern long int _IO_ftell (_IO_FILE*); +extern _IO_size_t _IO_fread (void*, _IO_size_t, _IO_size_t, _IO_FILE*); +extern _IO_size_t _IO_fwrite (const void*, _IO_size_t, _IO_size_t, _IO_FILE*); +extern char* _IO_gets (char*); extern void _IO_perror (const char*) __THROW; -extern int _IO_printf (const char*, ...) __THROW; -extern int _IO_puts (const char*) __THROW; -extern int _IO_scanf (const char*, ...) __THROW; +extern int _IO_printf (const char*, ...); +extern int _IO_puts (const char*); +extern int _IO_scanf (const char*, ...); extern void _IO_setbuffer (_IO_FILE *, char*, _IO_size_t) __THROW; extern int _IO_setvbuf (_IO_FILE*, char*, int, _IO_size_t) __THROW; extern int _IO_sscanf (const char*, const char*, ...) __THROW; @@ -89,11 +88,11 @@ extern _IO_size_t _IO_fread_internal (void*, _IO_size_t, _IO_size_t, _IO_FILE*) __THROW; extern _IO_FILE *_IO_fdopen_internal (int, const char*) __THROW; extern int _IO_vsprintf_internal (char*, const char*, _IO_va_list) __THROW; -extern int _IO_fflush_internal (_IO_FILE*) __THROW; +extern int _IO_fflush_internal (_IO_FILE*); extern _IO_size_t _IO_fwrite_internal (const void*, _IO_size_t, - _IO_size_t, _IO_FILE*) __THROW; -extern long int _IO_ftell_internal (_IO_FILE*) __THROW; -extern int _IO_fputs_internal (const char*, _IO_FILE*) __THROW; + _IO_size_t, _IO_FILE*); +extern long int _IO_ftell_internal (_IO_FILE*); +extern int _IO_fputs_internal (const char*, _IO_FILE*); extern int _IO_setvbuf_internal (_IO_FILE*, char*, int, _IO_size_t) __THROW; #ifdef __cplusplus diff --git a/libio/libioP.h b/libio/libioP.h index d11704d028..319b0fd5f3 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -440,18 +440,15 @@ extern void _IO_wdefault_finish (_IO_FILE *, int) __THROW; extern int _IO_default_pbackfail (_IO_FILE *, int) __THROW; extern wint_t _IO_wdefault_pbackfail (_IO_FILE *, wint_t) __THROW; extern _IO_FILE* _IO_default_setbuf (_IO_FILE *, char *, _IO_ssize_t) __THROW; -extern _IO_size_t _IO_default_xsputn (_IO_FILE *, const void *, _IO_size_t) - __THROW; -extern _IO_size_t _IO_wdefault_xsputn (_IO_FILE *, const void *, _IO_size_t) - __THROW; -extern _IO_size_t _IO_default_xsgetn (_IO_FILE *, void *, _IO_size_t) __THROW; -extern _IO_size_t _IO_wdefault_xsgetn (_IO_FILE *, void *, _IO_size_t) __THROW; +extern _IO_size_t _IO_default_xsputn (_IO_FILE *, const void *, _IO_size_t); +extern _IO_size_t _IO_wdefault_xsputn (_IO_FILE *, const void *, _IO_size_t); +extern _IO_size_t _IO_default_xsgetn (_IO_FILE *, void *, _IO_size_t); +extern _IO_size_t _IO_wdefault_xsgetn (_IO_FILE *, void *, _IO_size_t); extern _IO_off64_t _IO_default_seekoff (_IO_FILE *, _IO_off64_t, int, int) __THROW; extern _IO_off64_t _IO_default_seekpos (_IO_FILE *, _IO_off64_t, int) __THROW; -extern _IO_ssize_t _IO_default_write (_IO_FILE *, const void *, _IO_ssize_t) - __THROW; -extern _IO_ssize_t _IO_default_read (_IO_FILE *, void *, _IO_ssize_t) __THROW; +extern _IO_ssize_t _IO_default_write (_IO_FILE *, const void *, _IO_ssize_t); +extern _IO_ssize_t _IO_default_read (_IO_FILE *, void *, _IO_ssize_t); extern int _IO_default_stat (_IO_FILE *, void *) __THROW; extern _IO_off64_t _IO_default_seek (_IO_FILE *, _IO_off64_t, int) __THROW; extern int _IO_default_sync (_IO_FILE *) __THROW; @@ -657,16 +654,14 @@ extern int _IO_vsnprintf (char *string, _IO_size_t maxlen, __const char *format, _IO_va_list args) __THROW; -extern _IO_size_t _IO_getline (_IO_FILE *,char *, _IO_size_t, int, int) - __THROW; +extern _IO_size_t _IO_getline (_IO_FILE *,char *, _IO_size_t, int, int); extern _IO_size_t _IO_getline_info (_IO_FILE *,char *, _IO_size_t, - int, int, int *) __THROW; + int, int, int *); extern _IO_ssize_t _IO_getdelim (char **, _IO_size_t *, int, _IO_FILE *) __THROW; -extern _IO_size_t _IO_getwline (_IO_FILE *,wchar_t *, _IO_size_t, wint_t, int) - __THROW; +extern _IO_size_t _IO_getwline (_IO_FILE *,wchar_t *, _IO_size_t, wint_t, int); extern _IO_size_t _IO_getwline_info (_IO_FILE *,wchar_t *, _IO_size_t, - wint_t, int, wint_t *) __THROW; + wint_t, int, wint_t *); extern double _IO_strtod (const char *, char **) __THROW; extern char *_IO_dtoa (double __d, int __mode, int __ndigits, int *__decpt, int *__sign, char **__rve) __THROW; @@ -718,7 +713,7 @@ extern _IO_FILE* _IO_file_attach_internal (_IO_FILE *, int) __THROW; extern _IO_FILE* _IO_file_fopen_internal (_IO_FILE *, const char *, const char *, int) __THROW; extern _IO_ssize_t _IO_file_read_internal (_IO_FILE *, void *, - _IO_ssize_t) __THROW; + _IO_ssize_t); extern int _IO_file_sync_internal (_IO_FILE *) __THROW; extern _IO_off64_t _IO_file_seek_internal (_IO_FILE *, _IO_off64_t, int) __THROW; @@ -747,20 +742,18 @@ extern void _IO_link_in_internal (struct _IO_FILE_plus *) __THROW; extern int _IO_sputbackc_internal (_IO_FILE *, int) __THROW; extern void _IO_wdoallocbuf_internal (_IO_FILE *) __THROW; -extern _IO_size_t _IO_sgetn_internal (_IO_FILE *, void *, _IO_size_t) __THROW; +extern _IO_size_t _IO_sgetn_internal (_IO_FILE *, void *, _IO_size_t); extern void _IO_flush_all_linebuffered_internal (void) __THROW; extern int _IO_switch_to_wget_mode_internal (_IO_FILE *) __THROW; extern void _IO_unsave_markers_internal (_IO_FILE *) __THROW; extern void _IO_switch_to_main_wget_area_internal (_IO_FILE *) __THROW; -extern int _IO_wdo_write_internal (_IO_FILE *, const wchar_t *, _IO_size_t) - __THROW; -extern int _IO_do_write_internal (_IO_FILE *, const char *, _IO_size_t) - __THROW; +extern int _IO_wdo_write_internal (_IO_FILE *, const wchar_t *, _IO_size_t); +extern int _IO_do_write_internal (_IO_FILE *, const char *, _IO_size_t); extern _IO_ssize_t _IO_padn_internal (_IO_FILE *, int, _IO_ssize_t) __THROW; extern _IO_size_t _IO_getline_info_internal (_IO_FILE *,char *, _IO_size_t, - int, int, int *) __THROW; + int, int, int *); extern _IO_size_t _IO_getline_internal (_IO_FILE *, char *, _IO_size_t, int, - int) __THROW; + int); extern void _IO_free_wbackup_area_internal (_IO_FILE *) __THROW; extern void _IO_free_backup_area_internal (_IO_FILE *) __THROW; extern void _IO_switch_to_wbackup_area_internal (_IO_FILE *) __THROW; @@ -771,7 +764,7 @@ extern int _IO_vfscanf_internal (_IO_FILE * __restrict, const char * __restrict, _IO_va_list, int *__restrict); extern int _IO_vfprintf_internal (_IO_FILE *__restrict, const char *__restrict, - _IO_va_list) __THROW; + _IO_va_list); extern void _IO_doallocbuf_internal (_IO_FILE *) __THROW; extern void _IO_wsetb_internal (_IO_FILE *, wchar_t *, wchar_t *, int) __THROW; @@ -779,7 +772,7 @@ extern _IO_off64_t _IO_seekoff_unlocked (_IO_FILE *, _IO_off64_t, int, int) attribute_hidden __THROW; extern _IO_off64_t _IO_seekpos_unlocked (_IO_FILE *, _IO_off64_t, int) attribute_hidden __THROW; -extern int _IO_putc_internal (int __c, _IO_FILE *__fp) __THROW; +extern int _IO_putc_internal (int __c, _IO_FILE *__fp); extern void _IO_init_internal (_IO_FILE *, int) __THROW; extern void _IO_un_link_internal (struct _IO_FILE_plus *) __THROW; @@ -871,10 +864,10 @@ extern void _IO_un_link_internal (struct _IO_FILE_plus *) __THROW; # define OS_FSTAT fstat #endif struct stat; -extern _IO_ssize_t _IO_read (int, void *, _IO_size_t) __THROW; -extern _IO_ssize_t _IO_write (int, const void *, _IO_size_t) __THROW; +extern _IO_ssize_t _IO_read (int, void *, _IO_size_t); +extern _IO_ssize_t _IO_write (int, const void *, _IO_size_t); extern _IO_off64_t _IO_lseek (int, _IO_off64_t, int) __THROW; -extern int _IO_close (int) __THROW; +extern int _IO_close (int); extern int _IO_fstat (int, struct stat *) __THROW; extern int _IO_vscanf (const char *, _IO_va_list) __THROW; diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 4467bc16c9..392833f6a0 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,8 @@ +2004-11-27 Ulrich Drepper <drepper@redhat.com> + + * locales/pa_IN: Add some missing fields and fix some spelling + mistakes. Patch by Jatin Nansi <jnansi@redhat.com>. + 2004-10-31 Petter Reinholdtsen <pere@hungry.com> [BZ #337] diff --git a/localedata/locales/pa_IN b/localedata/locales/pa_IN index a1b49943bf..2a2072837b 100644 --- a/localedata/locales/pa_IN +++ b/localedata/locales/pa_IN @@ -1,11 +1,11 @@ comment_char % escape_char / -% Punjabi language locale for India. -% used hi_IN as guideline, Rajneesh K Saini <rajneeshksaini@yahoo.com> +% Punjabi language locale for Indian Punjabi(Gurmukhi) +% Last update by A Alam <amanlinux@netscape.net> LC_IDENTIFICATION -title "Punjabi language locale for India" -source "IndLinux.org" +title "Punjabi language locale for Indian Punjabi(Gurmukhi)" +source "IndLinux.org" address "" contact "" email "bug-glibc-locales@gnu.org" @@ -13,8 +13,8 @@ tel "" fax "" language "Punjabi" territory "India" -revision "0.01" -date "2002-04-10" +revision "0.2" +date "2004-09-30" % category "pa_IN:2000";LC_IDENTIFICATION category "pa_IN:2000";LC_CTYPE @@ -45,7 +45,7 @@ END LC_COLLATE LC_MONETARY % This is the POSIX Locale definition the LC_MONETARY category. int_curr_symbol "<U0049><U004E><U0052><U0020>" -currency_symbol "<U0A30><U0A42><U0A2A><U0A72><U0A48>" +currency_symbol "<U0A30><U0A41><U0A2A><U0A0F>" mon_decimal_point "<U002E>" mon_thousands_sep "<U002C>" mon_grouping 3 @@ -74,56 +74,56 @@ LC_TIME % for IBM Class for Unicode/Java % % Abbreviated weekday names (%a) -abday "<U0A06><U0A48><U0A24><U0020>";/ +abday "<U0A10><U0A24><U0020>";/ "<U0A38><U0A4B><U0A2E><U0020>";/ "<U0A2E><U0A70><U0A17><U0A32><U0020>";/ "<U0A2C><U0A41><U0A71><U0A27><U0020>";/ "<U0A35><U0A40><U0A30><U0020>";/ - "<U0A36><U0A41><U0A15><U0A30><U0020>";/ - "<U0A36><U0A28><U0A40><U0020>" + "<U0A36><U0A41><U0A71><U0A15><U0A30><U0020>";/ + "<U0A36><U0A28><U0A40><U0A1A><U0A30><U0020>" % % Full weekday names (%A) -day "<U0A06><U0A48><U0A24><U0A35><U0A3E><U0A30><U0020>";/ +day "<U0A10><U0A24><U0A35><U0A3E><U0A30><U0020>";/ "<U0A38><U0A4B><U0A2E><U0A35><U0A3E><U0A30><U0020>";/ "<U0A2E><U0A70><U0A17><U0A32><U0A35><U0A3E><U0A30><U0020>";/ "<U0A2C><U0A41><U0A71><U0A27><U0A35><U0A3E><U0A30><U0020>";/ "<U0A35><U0A40><U0A30><U0A35><U0A3E><U0A30><U0020>";/ - "<U0A36><U0A41><U0A15><U0A30><U0A35><U0A3E><U0A30><U0020>";/ - "<U0A36><U0A28><U0A40><U0A35><U0A3E><U0A30><U0020>" + "<U0A36><U0A41><U0A71><U0A15><U0A30><U0A35><U0A3E><U0A30><U0020>";/ + "<U0A36><U0A28><U0A40><U0A1A><U0A30><U0A35><U0A3E><U0A30><U0020>" % Abbreviated month names (%b) abmon "<U0A1C><U0A28><U0A35><U0A30><U0A40>";/ - "<U0A2B><U0A3C><U0A30><U0A35><U0A30><U0A40>";/ - "<U0A2E><U0A3E><U0A30><U0A1B>";/ - "<U0A05><U0A2A><U0A3C><U0A48><U0A32>";/ - "<U0A2E><U0A72><U0A40>";/ + "<U0A5E><U0A30><U0A35><U0A30><U0A40>";/ + "<U0A2E><U0A3E><U0A30><U0A1A>";/ + "<U0A05><U0A2A><U0A30><U0A48><U0A32>";/ + "<U0A2E><U0A08>";/ "<U0A1C><U0A42><U0A28>";/ - "<U0A1C><U0A41><U0A32><U0A3E><U0A72><U0A40>";/ + "<U0A1C><U0A41><U0A32><U0A3E><U0A08>";/ "<U0A05><U0A17><U0A38><U0A24>";/ - "<U0A38><U0A3F><U0A24><U0A70><U0A2C><U0A30>";/ + "<U0A38><U0A24><U0A70><U0A2C><U0A30>";/ "<U0A05><U0A15><U0A24><U0A42><U0A2C><U0A30>";/ "<U0A28><U0A35><U0A70><U0A2C><U0A30>";/ - "<U0A26><U0A3F><U0A38><U0A70><U0A2C><U0A30>" + "<U0A26><U0A38><U0A70><U0A2C><U0A30>" % % Full month names (%B) mon "<U0A1C><U0A28><U0A35><U0A30><U0A40>";/ - "<U0A2B><U0A3C><U0A30><U0A35><U0A30><U0A40>";/ - "<U0A2E><U0A3E><U0A30><U0A1B>";/ - "<U0A05><U0A2A><U0A3C><U0A48><U0A32>";/ - "<U0A2E><U0A72><U0A40>";/ + "<U0A5E><U0A30><U0A35><U0A30><U0A40>";/ + "<U0A2E><U0A3E><U0A30><U0A1A>";/ + "<U0A05><U0A2A><U0A30><U0A48><U0A32>";/ + "<U0A2E><U0A08>";/ "<U0A1C><U0A42><U0A28>";/ - "<U0A1C><U0A41><U0A32><U0A3E><U0A72><U0A40>";/ + "<U0A1C><U0A41><U0A32><U0A3E><U0A08>";/ "<U0A05><U0A17><U0A38><U0A24>";/ - "<U0A38><U0A3F><U0A24><U0A70><U0A2C><U0A30>";/ + "<U0A38><U0A24><U0A70><U0A2C><U0A30>";/ "<U0A05><U0A15><U0A24><U0A42><U0A2C><U0A30>";/ "<U0A28><U0A35><U0A70><U0A2C><U0A30>";/ - "<U0A26><U0A3F><U0A38><U0A70><U0A2C><U0A30>" + "<U0A26><U0A38><U0A70><U0A2C><U0A30>" % % Equivalent of AM PM -am_pm "<U092A><U0942><U0930><U094D><U0935><U093E><U0939><U094D><U0928>";/ - "<U0905><U092A><U0930><U093E><U0939><U094D><U0928>" +am_pm "<U0A38><U035><U0A47><U0A30><U0A47>";/ + "<U0A36><U0A3E><U02E>" % % Appropriate date and time representation |