2000-08-21  Andreas Jaeger  <aj@suse.de>

	* include/poll.h: Include include/sys/poll.h to get __poll
	declaration.

	* io/sys/poll.h: Move __poll declaration from here...
	* include/sys/poll.h: ...to here.

	* include/sys/socket.h (__getpeername): Add declaration.

	* include/wchar.h (__vswprintf): Add declaration.

	* include/stdio.h (__flockfile): Add declaration.
	(__funlockfile): Likewise.
This commit is contained in:
Andreas Jaeger 2000-08-21 16:02:48 +00:00
parent 3d421b2845
commit d4b0774fc6
6 changed files with 34 additions and 5 deletions

View File

@ -1,3 +1,18 @@
2000-08-21 Andreas Jaeger <aj@suse.de>
* include/poll.h: Include include/sys/poll.h to get __poll
declaration.
* io/sys/poll.h: Move __poll declaration from here...
* include/sys/poll.h: ...to here.
* include/sys/socket.h (__getpeername): Add declaration.
* include/wchar.h (__vswprintf): Add declaration.
* include/stdio.h (__flockfile): Add declaration.
(__funlockfile): Likewise.
2000-08-20 Ulrich Drepper <drepper@redhat.com>
* misc/sys/cdefs.h: Define __restrict_arr.

View File

@ -1 +1 @@
#include <io/poll.h>
#include <include/sys/poll.h>

View File

@ -50,6 +50,12 @@ extern int __gen_tempname (char *__tmpl, int __kind);
extern void __libc_fatal (__const char *__message)
__attribute__ ((__noreturn__));
/* Acquire ownership of STREAM. */
extern void __flockfile (FILE *__stream);
/* Relinquish the ownership granted for STREAM. */
extern void __funlockfile (FILE *__stream);
# endif
#endif

View File

@ -1 +1,6 @@
#include <io/sys/poll.h>
#ifndef _SYS_POLL_H
# include <io/sys/poll.h>
extern int __poll (struct pollfd *__fds, unsigned long int __nfds,
int __timeout);
#endif

View File

@ -43,5 +43,10 @@ extern int __vfwscanf (FILE *__restrict __s,
__const wchar_t *__restrict __format,
__gnuc_va_list __arg)
/* __attribute__ ((__format__ (__wscanf__, 2, 0)) */;
extern int __vswprintf (wchar_t *__restrict __s, size_t __n,
__const wchar_t *__restrict __format,
__gnuc_va_list __arg)
/* __attribute__ ((__format__ (__wprintf__, 3, 0))) */;
# endif
#endif

View File

@ -1,5 +1,5 @@
/* Compatibility definitions for System V `poll' interface.
Copyright (C) 1994, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
Copyright (C) 1994,96,97,98,99,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
@ -41,8 +41,6 @@ struct pollfd
an event to occur; if TIMEOUT is -1, block until an event occurs.
Returns the number of file descriptors with events, zero if timed out,
or -1 for errors. */
extern int __poll (struct pollfd *__fds, unsigned long int __nfds,
int __timeout) __THROW;
extern int poll (struct pollfd *__fds, unsigned long int __nfds, int __timeout)
__THROW;