* libio/genops.c (_IO_un_link): Move #ifdef introduced in last
	change in right place.

	* sysdeps/unix/sysv/linux/sys/timex.h: Add MAXTC from kernel
	header.  Suggested by Thomas Quinot <thomas@Cuivre.FR.EU.ORG>.

1999-01-28  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* libio/getc_u.c (__getc_unlocked): Avoid compiler warning.

1999-01-28  Ulrich Drepper  <drepper@cygnus.com>
This commit is contained in:
Ulrich Drepper 1999-01-28 13:53:14 +00:00
parent 51e176c2c2
commit d328b80b4e
4 changed files with 18 additions and 4 deletions

View File

@ -1,3 +1,15 @@
1999-01-28 Ulrich Drepper <drepper@cygnus.com>
* libio/genops.c (_IO_un_link): Move #ifdef introduced in last
change in right place.
* sysdeps/unix/sysv/linux/sys/timex.h: Add MAXTC from kernel
header. Suggested by Thomas Quinot <thomas@Cuivre.FR.EU.ORG>.
1999-01-28 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* libio/getc_u.c (__getc_unlocked): Avoid compiler warning.
1999-01-28 Ulrich Drepper <drepper@cygnus.com>
* libio/genops.c (_IO_un_link, _IO_link_in): Don't use locking if

View File

@ -41,8 +41,8 @@ _IO_un_link (fp)
{
if (fp->_flags & _IO_LINKED)
{
#ifdef _IO_MTSAFE_IO
_IO_FILE **f;
#ifdef _IO_MTSAFE_IO
_IO_lock_lock (list_all_lock);
#endif
for (f = &_IO_list_all; *f != NULL; f = &(*f)->_chain)

View File

@ -29,8 +29,7 @@
#undef getc_unlocked
int
__getc_unlocked (fp)
FILE *fp;
__getc_unlocked (FILE *fp)
{
CHECK_FILE (fp, EOF);
return _IO_getc_unlocked (fp);

View File

@ -22,7 +22,7 @@
#include <features.h>
#include <sys/time.h>
/* These definitions from linux/timex.h as of 2.1.130. */
/* These definitions from linux/timex.h as of 2.2.0. */
struct ntptimeval
{
@ -111,6 +111,9 @@ struct timex
#define TIME_ERROR 5 /* clock not synchronized */
#define TIME_BAD TIME_ERROR /* bw compat */
/* Maximum time constant of the PLL. */
#define MAXTC 6
__BEGIN_DECLS
extern int __adjtimex __P ((struct timex *__ntx));