diff options
Diffstat (limited to 'stdio')
| -rw-r--r-- | stdio/feof.c | 32 | ||||
| -rw-r--r-- | stdio/stdio.h | 9 |
2 files changed, 23 insertions, 18 deletions
diff --git a/stdio/feof.c b/stdio/feof.c index b98220799f..79e7f59975 100644 --- a/stdio/feof.c +++ b/stdio/feof.c @@ -1,20 +1,20 @@ /* Copyright (C) 1991, 1996 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 -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <errno.h> #include <stdio.h> diff --git a/stdio/stdio.h b/stdio/stdio.h index bf4f7b818c..705fd832d0 100644 --- a/stdio/stdio.h +++ b/stdio/stdio.h @@ -169,6 +169,10 @@ extern void __libc_fatal __P ((__const char *__message)) __attribute__ ((__noreturn__)); +/* For thread safe I/O functions we need a lock in each stream. We + keep the type opaque here. */ +struct __stdio_lock; + /* The FILE structure. */ struct __stdio_file { @@ -176,8 +180,8 @@ struct __stdio_file for the glue to Unix stdio getc/putc to work. NOTE: stdio/glue.c has special knowledge of these first four members. */ int __magic; -#define _IOMAGIC 0xfedabeeb /* Magic number to fill `__magic'. */ -#define _GLUEMAGIC 0xfeedbabe /* Magic for glued Unix streams. */ +#define _IOMAGIC ((int) 0xfedabeeb) /* Magic number to fill `__magic'. */ +#define _GLUEMAGIC ((int) 0xfeedbabe) /* Magic for glued Unix streams. */ char *__bufp; /* Pointer into the buffer. */ char *__get_limit; /* Reading limit. */ @@ -202,6 +206,7 @@ struct __stdio_file unsigned int __linebuf_active:1; /* put_limit is not really in use. */ unsigned int __seen:1; /* This stream has been seen. */ unsigned int __ispipe:1; /* Nonzero if opened by popen. */ + struct __stdio_lock *__lock; /* Pointer to associated lock. */ }; |