diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-01-30 04:09:36 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-01-30 04:09:36 +0000 |
commit | 19361cb768c280e47f2ca69ed63e1d75f332e592 (patch) | |
tree | 785385b6029dfd47c9d2b6309b9eb6c5b3b4f59f /libio/stdio.h | |
parent | 56552e4257910954051f3ff02c0ee2609c7ca688 (diff) | |
download | glibc-19361cb768c280e47f2ca69ed63e1d75f332e592.zip glibc-19361cb768c280e47f2ca69ed63e1d75f332e592.tar.gz glibc-19361cb768c280e47f2ca69ed63e1d75f332e592.tar.bz2 |
update from main archive 970129cvs/libc-970201cvs/libc-970131cvs/libc-970130
1997-01-30 03:24 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/i386/elf/start.S (_start): Align stack pointer to
double word boundary before pushing args for main. This way we
don't get penalties for misaligned memory accesses. Reported by
Edward Seidl <seidl@janed.com>.
* Makefile: Correct *my* changes of Richards patch of 1997-01-28 10:51.
Patch by HJ Lu.
* misc/bsd-compat.c: Update copyright.
* misc/efgcvt.c: Likewise.
* misc/efgcvt_r.c: Likewise.
* misc/error.c: Likewise.
* misc/error.h: Likewise.
* misc/fstab.c: Likewise.
* misc/init-misc.c: Likewise.
* misc/lsearch.c: Likewise.
* misc/mntent.c: Likewise.
* misc/qefgcvt.c: Likewise.
* misc/qefgcvt_r.c: Likewise.
* nss/databases.def: Likewise.
* nss/db-Makefile: Likewise.
* nss/ethers-lookup.c: Likewise.
* nss/hosts-lookup.c: Likewise.
* nss/netgrp-lookup.c: Likewise.
* nss/nsswitch.h: Likewise.
* nss/proto-lookup.c: Likewise.
* nss/rpc-lookup.c: Likewise.
* nss/service-lookup.c: Likewise.
* nss/nss_db/db-netgrp.c: Likewise.
* nss/nss_files/files-grp.c: Likewise.
* nss/nss_files/files-hosts.c: Likewise.
* nss/nss_files/files-network.c: Likewise.
* nss/nss_files/files-proto.c: Likewise.
* nss/nss_files/files-pwd.c: Likewise.
* nss/nss_files/files-rpc.c: Likewise.
* nss/nss_files/files-service.c: Likewise.
* nss/nss_files/files-spwd.c: Likewise.
* shadow/fgetspent.c: Likewise.
* shadow/fgetspent_r.c: Likewise.
* shadow/getspent.c: Likewise.
* shadow/getspent_r.c: Likewise.
* shadow/getspnam.c: Likewise.
* shadow/getspnam_r.c: Likewise.
* shadow/putspent.c: Likewise.
* shadow/sgetspent.c: Likewise.
* shadow/sgetspent_r.c: Likewise.
* sysdeps/i386/init-first.c: Likewise.
* sysdeps/unix/i386/sysdep.S: Likewise.
* shadow/shadow.h: Don't use __USE_REENTRENT. All code must be
prepared to be running in a multi-threaded environment. Change
to __USE_MISC unless the function is defined in POSIX.1 (in this
case also test for __USE_POSIX).
* dirent/dirent.h: Likewise.
* grp/grp.h: Likewise.
* inet/aliases.h: Likewise.
* libio/libio.h: Likewise.
* libio/stdio.h: Likewise.
* login/utmp.h: Likewise.
* math/mathcalls.h: Likewise.
* misc/mntent.h: Likewise.
* pwd/pwd.h: Likewise.
* resolv/netdb.h: Likewise.
* stdlib/stdlib.h: Likewise.
* string/string.h: Likewise.
* sunrpc/rpc/netdb.h: Likewise.
* sysdeps/generic/crypt.h: Likewise.
* sysdeps/unix/sysv/linux/errnos.h: Likewise.
* time/time.h: Likewise.
1997-01-30 00:27 Fila Kolodny <fila@ibi.com>
* sunrpc/Makefile (install-others): Add rpcsvc/bootparam_prot.h
only if not cross compiling.
1997-01-29 16:16 Fila Kolodny <fila@ibi.com>
* sysdeps/posix/sigpause.c: Include <stddef.h> to get definition of
NULL.
* sysdeps/posix/sigwait.c: Likewise.
1997-01-28 23:42 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Makeconfig ($(common-objpfx)config.make): Depend on
$(..)config.make.in.
Diffstat (limited to 'libio/stdio.h')
-rw-r--r-- | libio/stdio.h | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/libio/stdio.h b/libio/stdio.h index e732fa6..88e9c6a 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -1,6 +1,6 @@ /* This is part of the iostream/stdio library, providing -*- C -*- I/O. Define ANSI C stdio on top of C++ iostreams. - Copyright (C) 1991, 1994, 1995, 1996 Free Software Foundation, Inc. + Copyright (C) 1991, 1994, 1995, 1996, 1997 Free Software Foundation, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -138,7 +138,7 @@ extern int sprintf __P ((char*, __const char* format, ...)); extern int sscanf __P ((__const char* string, __const char* format, ...)); extern FILE* tmpfile __P ((void)); extern char* tmpnam __P ((char*)); -#ifdef __USE_REENTRANT +#ifdef __USE_MISC extern char* tmpnam_r __P ((char*)); #endif #if defined(__USE_SVID) || defined(__USE_XOPEN) @@ -224,7 +224,7 @@ extern const char *const _sys_errlist[]; #endif /* Handle locking of streams. */ -#ifdef __USE_REENTRANT +#ifdef __USE_MISC extern void clearerr_locked __P ((FILE *)); extern void clearerr_unlocked __P ((FILE *)); extern int feof_locked __P ((FILE *)); @@ -233,9 +233,6 @@ extern int ferror_locked __P ((FILE*)); extern int ferror_unlocked __P ((FILE*)); extern int fileno_locked __P ((FILE *)); extern int fileno_unlocked __P ((FILE *)); -extern void flockfile __P ((FILE *)); -extern void funlockfile __P ((FILE *)); -extern int ftrylockfile __P ((FILE *)); extern int fclose_unlocked __P ((FILE *)); extern int fflush_locked __P ((FILE *)); extern int fflush_unlocked __P ((FILE *)); @@ -245,24 +242,35 @@ extern size_t fwrite_unlocked __P ((const void *, size_t, size_t, FILE *)); extern int fputc_locked __P ((int, FILE*)); extern int fputc_unlocked __P ((int, FILE*)); extern int getc_locked __P ((FILE *)); -extern int getc_unlocked __P ((FILE *)); extern int getchar_locked __P ((void)); -extern int getchar_unlocked __P ((void)); extern int putc_locked __P ((int, FILE *)); -extern int putc_unlocked __P ((int, FILE *)); extern int putchar_locked __P ((int)); -extern int putchar_unlocked __P ((int)); # ifndef _LIBC -# define getc_unlocked(fp) _IO_getc_unlocked (fp) # define getc_locked(fp) _IO_getc (fp) -# define getchar_unlocked() _IO_getc_unlocked (stdin) # define getchar_locked() _IO_getc (stdin) -# define putchar_unlocked(c) _IO_putc_unlocked (c, stdout) # define putchar_locked(c) _IO_putc (c, stdout) # endif +#endif -#endif /* __USE_REENTRANT */ +#if defined __USE_POSIX || defined __USE_MISC +/* These are defined in POSIX.1:1996. */ +extern void flockfile __P ((FILE *)); +extern void funlockfile __P ((FILE *)); +extern int ftrylockfile __P ((FILE *)); + +extern int getc_unlocked __P ((FILE *)); +extern int getchar_unlocked __P ((void)); +extern int putc_unlocked __P ((int, FILE *)); +extern int putchar_unlocked __P ((int)); + +# ifndef _LIBC +# define getc_unlocked(fp) _IO_getc_unlocked (fp) +# define getchar_unlocked() _IO_getc_unlocked (stdin) +# define putc_unlocked(c, fp) _IO_putc_unlocked ((c), (fp)) +# define putchar_unlocked(c) _IO_putc_unlocked ((c), stdout) +# endif +#endif /* POSIX || misc */ #define getc(_fp) _IO_getc (_fp) #define putc(_ch, _fp) _IO_putc (_ch, _fp) |