aboutsummaryrefslogtreecommitdiff
path: root/stdio
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 /stdio
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 'stdio')
-rw-r--r--stdio/stdio.h22
1 files changed, 17 insertions, 5 deletions
diff --git a/stdio/stdio.h b/stdio/stdio.h
index 7be0c24..c67ab63 100644
--- a/stdio/stdio.h
+++ b/stdio/stdio.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1999, 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
@@ -17,12 +17,12 @@
Boston, MA 02111-1307, USA. */
/*
- * ISO C Standard: 4.9 INPUT/OUTPUT <stdio.h>
+ * ISO C99 Standard: 7.19 Input/output <stdio.h>
*/
#ifndef _STDIO_H
-#if !defined(__need_FILE)
+#if !defined(__need_FILE) && !defined(__need___FILE)
#define _STDIO_H 1
#include <features.h>
@@ -39,17 +39,29 @@ __BEGIN_DECLS
#endif
#include <bits/types.h>
+#define __need_FILE
+#define __need___FILE
#endif /* Don't need FILE. */
-#undef __need_FILE
-#ifndef __FILE_defined
+#if !defined __FILE_defined && defined __need_FILE
/* The opaque type of streams. */
typedef struct __stdio_file FILE;
#define __FILE_defined 1
#endif /* FILE not defined. */
+#undef __need_FILE
+
+
+#if !defined ____FILE_defined && defined __need___FILE
+
+/* The opaque type of streams. */
+typedef struct __stdio_file __FILE;
+
+#define ____FILE_defined 1
+#endif /* __FILE not defined. */
+#undef __need___FILE
#ifdef _STDIO_H