aboutsummaryrefslogtreecommitdiff
path: root/wcsmbs
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-06-21 13:38:44 +0000
committerUlrich Drepper <drepper@redhat.com>1999-06-21 13:38:44 +0000
commit655c0697188085dea9377402e5fe9eadbe591a4f (patch)
tree2980da2361a28d97051cc3f69a8e8e9733df2dd8 /wcsmbs
parent8811906f25f4c4592419a2073f785edf0b7061de (diff)
downloadglibc-655c0697188085dea9377402e5fe9eadbe591a4f.tar
glibc-655c0697188085dea9377402e5fe9eadbe591a4f.tar.gz
glibc-655c0697188085dea9377402e5fe9eadbe591a4f.tar.bz2
glibc-655c0697188085dea9377402e5fe9eadbe591a4f.zip
Update.
1999-06-18 Thorsten Kukuk <kukuk@suse.de> * sysdeps/alpha/atomicity.h: Correct counting of subsections. 1999-06-17 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * stdlib/tst-strtoll.c: Avoid warning about huge constant. 1999-06-20 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * stdio-common/vfprintf.c (group_member): Make parameters and return types pointers to CHAR_T instead of UCHAR_T. (vfprintf): Change type of work_buffer, workend and string to CHAR_T pointer/array. (process_arg, process_string_arg): Adjust/remove casts. Add missing use of L_ macro. (printf_unknown): Add missing uses of L_ macro. 1999-06-20 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * wcsmbs/wcschrnul.c: Explicitly cast return value to avoid warning. 1999-06-20 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * libio/wgenops.c (__wuflow): Fix use of WEOF vs. EOF. Call _IO_switch_to_wget_mode instead of _IO_switch_to_get_mode. (__wunderflow): Likewise. (_IO_switch_to_wget_mode): Likewise. (_IO_init_wmarker): Likewise. * libio/wfileops.c (_IO_wfile_seekoff): Call _IO_switch_to_wget_mode, not _IO_switch_to_get_mode. (_IO_wfile_jumps): Fix pbackfail entry. * libio/iosetvbuf.c (_IO_setvbuf): Only call wide char setbuf function if the stream is currently unoriented. 1999-06-19 Zack Weinberg <zack@rabi.columbia.edu> * wcsmbs/wchar.h: Define __need___va_list before including stdarg.h. Wrap all wide stream functions with #ifdef __USE_ISOC9X. Use __gnuc_va_list in v*w(printf|scanf) prototypes. 1999-06-20 Andreas Jaeger <aj@arthur.rhein-neckar.de> * libio/oldiopopen.c (_IO_old_proc_open): Apply change from 1999-03-29 to iopopen also here. Reported by Richard Braakman <dark@xs4all.nl>. 1999-06-20 Andreas Jaeger <aj@arthur.rhein-neckar.de> * include/features.h: Use __GNUC_PREREQ. * sysdeps/i386/fpu/bits/mathinline.h: Likewise 1999-06-19 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * stdio-common/vfscanf.c (ungetc, inchar) [COMPILE_WPRINTF]: Change EOF to WEOF and remove cast. (UNGETC): Remove macro. (_IO_vfwscanf): Change isspace to ISSPACE and UNGETC to ungetc. * stdio-common/printf-parse.h (find_spec) [!COMPILE_WPRINTF]: Change ISASCII to isascii and MBRLEN to mbrlen. (parse_one_spec): Compare info.spec always against wchar_t values. * stdio-common/vfprintf.c: Remove unused ISASCII and MBRLEN. (_itoa, _itoa_word) [COMPILE_WRPINTF]: Don't cast second argument. (NOT_IN_JUMP_RANGE, CHAR_CLASS): Change (int) to (INT_T), use L_. 1999-06-19 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * libio/Makefile (shared-only-routines): Add oldiofgetpos, oldiofgetpos64, oldiofsetpos and oldiofsetpos64. (routines): Include oldiofgetpos, oldiofgetpos64, oldiofsetpos and oldiofsetpos64 only if doing versioning.
Diffstat (limited to 'wcsmbs')
-rw-r--r--wcsmbs/wchar.h20
-rw-r--r--wcsmbs/wcschrnul.c2
2 files changed, 14 insertions, 8 deletions
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index e0e28bd3c1..d9ff631fcb 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -32,6 +32,8 @@
/* Get FILE definition. */
# define __need_FILE
# include <stdio.h>
+/* Get va_list definition. */
+# define __need___va_list
# include <stdarg.h>
/* Get size_t, wchar_t, wint_t and NULL from <stddef.h>. */
@@ -519,6 +521,7 @@ extern wchar_t *wcpncpy __P ((wchar_t *__dest, __const wchar_t *__src,
/* Wide character I/O functions. */
+#ifdef __USE_ISOC9X
/* Select orientation for stream. */
extern int fwide __P ((FILE *__fp, int __mode));
@@ -539,17 +542,17 @@ extern int swprintf __P ((wchar_t *__restrict __s, size_t __n,
/* Write formatted output to S from argument list ARG. */
extern int vfwprintf __P ((FILE *__restrict __s,
__const wchar_t *__restrict __format,
- va_list __arg))
+ __gnuc_va_list __arg))
/* __attribute__ ((__format__ (__wprintf__, 2, 0))) */;
/* Write formatted output to stdout from argument list ARG. */
extern int vwprintf __P ((__const wchar_t *__restrict __format,
- va_list __arg))
+ __gnuc_va_list __arg))
/* __attribute__ ((__format__ (__wprintf__, 1, 0))) */;
/* Write formatted output of at most N character to S from argument
list ARG. */
extern int vswprintf __P ((wchar_t *__restrict __s, size_t __n,
__const wchar_t *__restrict __format,
- va_list __arg))
+ __gnuc_va_list __arg))
/* __attribute__ ((__format__ (__wprintf__, 3, 0))) */;
@@ -567,14 +570,17 @@ extern int swscanf __P ((__const wchar_t *__restrict __s,
/* Read formatted input from S into argument list ARG. */
extern int vfwscanf __P ((FILE *__restrict __s,
- __const wchar_t *__restrict __format, va_list __arg))
+ __const wchar_t *__restrict __format,
+ __gnuc_va_list __arg))
/* __attribute__ ((__format__ (__wscanf__, 2, 0))) */;
/* Read formatted input from stdin into argument list ARG. */
-extern int vwscanf __P ((__const wchar_t *__restrict __format, va_list __arg))
+extern int vwscanf __P ((__const wchar_t *__restrict __format,
+ __gnuc_va_list __arg))
/* __attribute__ ((__format__ (__wscanf__, 1, 0))) */;
/* Read formatted input from S into argument list ARG. */
extern int vswscanf __P ((__const wchar_t *__restrict __s,
- __const wchar_t *__restrict __format, va_list __arg))
+ __const wchar_t *__restrict __format,
+ __gnuc_va_list __arg))
/* __attribute__ ((__format__ (__wscanf__, 2, 0))) */;
@@ -647,7 +653,7 @@ extern wint_t ungetwc __P ((wint_t __wc, FILE *__stream));
extern size_t wcsftime __P ((wchar_t *__restrict __s, size_t __maxsize,
__const wchar_t *__restrict __format,
__const struct tm *__restrict __tp));
-
+#endif /* Use ISO C9x. */
/* The X/Open standard demands that most of the functions defined in
the <wctype.h> header must also appear here. This is probably
diff --git a/wcsmbs/wcschrnul.c b/wcsmbs/wcschrnul.c
index 2ea9b2ccc2..ff24659e5e 100644
--- a/wcsmbs/wcschrnul.c
+++ b/wcsmbs/wcschrnul.c
@@ -31,6 +31,6 @@ __wcschrnul (wcs, wc)
else
++wcs;
- return wcs;
+ return (wchar_t *) wcs;
}
weak_alias (__wcschrnul, wcschrnul)