aboutsummaryrefslogtreecommitdiff
path: root/wcsmbs/wchar.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-09-14 01:43:19 +0000
committerUlrich Drepper <drepper@redhat.com>2000-09-14 01:43:19 +0000
commitd16463090097b7257b382bceee74410b55316559 (patch)
tree99c5356e53015a1a15e22e8923d9ba3d56ad853c /wcsmbs/wchar.h
parentd817a438929c3e1f83a42f70b0060e843577b299 (diff)
downloadglibc-d16463090097b7257b382bceee74410b55316559.zip
glibc-d16463090097b7257b382bceee74410b55316559.tar.gz
glibc-d16463090097b7257b382bceee74410b55316559.tar.bz2
Update.
* libio/stdio.h: Define __FILE if __need___FILE is defined. * stdio/stdio.h: Likewise. * wcsmbs/wchar.h: Get definition of __FILE. Use __FILE instead of FILE. * include/stdio.h: Handle __need___FILE like __need_FILE. * include/wchar.h: Use __FILE instead of FILE. * libio/fwprintf.c: Include <stdio.h> for FILE definition. * libio/fwscanf.c: Likewise. * libio/getwc.c: Likewise. * sysdeps/generic/stdint.h (WINT_MAX): Define to 4294967295u. * sysdeps/generic/bits/wchar.h (WCHAR_MIN): Define to -2147483647 - 1. * sysdeps/unix/sysv/linux/i386/bits/wchar.h: Likewise. * assert/assert.h: Update comment header about ISO C section. * math/complex.h: Likewise. * ctype/ctype.h: Likewise. * include/errno.h: Likewise. * include/limits.h: Likewise. * locale/locale.h: Likewise. * math/math.h: Likewise. * setjmp/setjmp.h: Likewise. * signal/signal.h: Likewise. * stdio/stdio.h: Likewise. * libio/stdio.h: Likewise. * stdlib/stdlib.h: Likewise. * string/string.h: Likewise. * time/time.h: Likewise. * wcsmbs/wchar.h: Likewise. * wctype/wctype.h: Likewise. Patches by Joseph S. Myers <jsm28@cam.ac.uk>. 2000-09-13 Andreas Jaeger <aj@suse.de> * sysdeps/unix/sysv/linux/bits/socket.h (__cmsg_nxthdr): Fix test for no more entries. * sysdeps/unix/sysv/aix/bits/socket.h (__cmsg_nxthdr): Likewise. * sysdeps/unix/sysv/linux/mips/bits/socket.h (__cmsg_nxthdr): Likewise. Reported by Eric S. Johnson <esj@cs.fiu.edu>, closes PR libc/1887. 2000-09-13 Ulrich Drepper <drepper@redhat.com>
Diffstat (limited to 'wcsmbs/wchar.h')
-rw-r--r--wcsmbs/wchar.h42
1 files changed, 21 insertions, 21 deletions
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 9cbc001..92aa5db 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -17,8 +17,8 @@
Boston, MA 02111-1307, USA. */
/*
- * ISO C Standard, Amendment 1, 7.16.4
- * General wide-string utilities <wchar.h>
+ * ISO C99 Standard: 7.24
+ * Extended multibyte and wide character utilities <wchar.h>
*/
#ifndef _WCHAR_H
@@ -30,7 +30,7 @@
#ifdef _WCHAR_H
/* Get FILE definition. */
-# define __need_FILE
+# define __need___FILE
# include <stdio.h>
/* Get va_list definition. */
# define __need___va_list
@@ -537,11 +537,11 @@ extern wchar_t *wcpncpy (wchar_t *__dest, __const wchar_t *__src, size_t __n)
#if defined __USE_ISOC99 || defined __USE_UNIX98
/* Select orientation for stream. */
-extern int fwide (FILE *__fp, int __mode) __THROW;
+extern int fwide (__FILE *__fp, int __mode) __THROW;
/* Write formatted output to STREAM. */
-extern int fwprintf (FILE *__restrict __stream,
+extern int fwprintf (__FILE *__restrict __stream,
__const wchar_t *__restrict __format, ...)
__THROW /* __attribute__ ((__format__ (__wprintf__, 2, 3))) */;
/* Write formatted output to stdout. */
@@ -553,7 +553,7 @@ extern int swprintf (wchar_t *__restrict __s, size_t __n,
__THROW /* __attribute__ ((__format__ (__wprintf__, 3, 4))) */;
/* Write formatted output to S from argument list ARG. */
-extern int vfwprintf (FILE *__restrict __s,
+extern int vfwprintf (__FILE *__restrict __s,
__const wchar_t *__restrict __format,
__gnuc_va_list __arg)
__THROW /* __attribute__ ((__format__ (__wprintf__, 2, 0))) */;
@@ -570,7 +570,7 @@ extern int vswprintf (wchar_t *__restrict __s, size_t __n,
/* Read formatted input from STREAM. */
-extern int fwscanf (FILE *__restrict __stream,
+extern int fwscanf (__FILE *__restrict __stream,
__const wchar_t *__restrict __format, ...)
__THROW /* __attribute__ ((__format__ (__wscanf__, 2, 3))) */;
/* Read formatted input from stdin. */
@@ -584,7 +584,7 @@ extern int swscanf (__const wchar_t *__restrict __s,
#ifdef __USE_ISOC99
/* Read formatted input from S into argument list ARG. */
-extern int vfwscanf (FILE *__restrict __s,
+extern int vfwscanf (__FILE *__restrict __s,
__const wchar_t *__restrict __format,
__gnuc_va_list __arg)
__THROW /* __attribute__ ((__format__ (__wscanf__, 2, 0))) */;
@@ -601,16 +601,16 @@ extern int vswscanf (__const wchar_t *__restrict __s,
/* Read a character from STREAM. */
-extern wint_t fgetwc (FILE *__stream);
-extern wint_t getwc (FILE *__stream);
+extern wint_t fgetwc (__FILE *__stream);
+extern wint_t getwc (__FILE *__stream);
/* Read a character from stdin. */
extern wint_t getwchar (void);
/* Write a character to STREAM. */
-extern wint_t fputwc (wchar_t __wc, FILE *__stream);
-extern wint_t putwc (wchar_t __wc, FILE *__stream);
+extern wint_t fputwc (wchar_t __wc, __FILE *__stream);
+extern wint_t putwc (wchar_t __wc, __FILE *__stream);
/* Write a character to stdout. */
extern wint_t putwchar (wchar_t __wc);
@@ -619,42 +619,42 @@ extern wint_t putwchar (wchar_t __wc);
/* Get a newline-terminated wide character string of finite length
from STREAM. */
extern wchar_t *fgetws (wchar_t *__restrict __ws, int __n,
- FILE *__restrict __stream);
+ __FILE *__restrict __stream);
/* Write a string to STREAM. */
extern int fputws (__const wchar_t *__restrict __ws,
- FILE *__restrict __stream);
+ __FILE *__restrict __stream);
/* Push a character back onto the input buffer of STREAM. */
-extern wint_t ungetwc (wint_t __wc, FILE *__stream);
+extern wint_t ungetwc (wint_t __wc, __FILE *__stream);
#ifdef __USE_GNU
/* These are defined to be equivalent to the `char' functions defined
in POSIX.1:1996. */
-extern wint_t getwc_unlocked (FILE *__stream);
+extern wint_t getwc_unlocked (__FILE *__stream);
extern wint_t getwchar_unlocked (void);
/* This is the wide character version of a GNU extension. */
-extern wint_t fgetwc_unlocked (FILE *__stream);
+extern wint_t fgetwc_unlocked (__FILE *__stream);
/* Faster version when locking is not necessary. */
-extern wint_t fputwc_unlocked (wchar_t __wc, FILE *__stream);
+extern wint_t fputwc_unlocked (wchar_t __wc, __FILE *__stream);
/* These are defined to be equivalent to the `char' functions defined
in POSIX.1:1996. */
-extern wint_t putwc_unlocked (wchar_t __wc, FILE *__stream);
+extern wint_t putwc_unlocked (wchar_t __wc, __FILE *__stream);
extern wint_t putwchar_unlocked (wchar_t __wc);
/* This function does the same as `fgetws' but does not lock the stream. */
extern wchar_t *fgetws_unlocked (wchar_t *__restrict __ws, int __n,
- FILE *__restrict __stream);
+ __FILE *__restrict __stream);
/* This function does the same as `fputws' but does not lock the stream. */
extern int fputws_unlocked (__const wchar_t *__restrict __ws,
- FILE *__restrict __stream);
+ __FILE *__restrict __stream);
#endif