Update.

	* 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>

diff --git a/ChangeLog b/ChangeLog
index e26dab147cd62d391979ab7651186bdb726009e2..91e27dadb2aeacc0bec46686d7017ca802a3c07d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/libio/genops.c b/libio/genops.c
index f925b0d87b414ba4e339da2973ffdd9ff2a9ad79..81752e3ccc9b7bffc94bffad1e2d6dd33627d580 100644 (file)
--- a/libio/genops.c
+++ b/libio/genops.c
@@ -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)

diff --git a/libio/getc_u.c b/libio/getc_u.c
index 5572ef6b3e708d6e31278e0d2cbed449e568ab3c..a722a315f264dfaceccd03486baf46670241d239 100644 (file)
--- a/libio/getc_u.c
+++ b/libio/getc_u.c
@@ -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);

diff --git a/sysdeps/unix/sysv/linux/sys/timex.h b/sysdeps/unix/sysv/linux/sys/timex.h
index 7e2a47512890974ac64d95813e18e4fa69d47280..900341e5454382c8df4b6e112b730d16780c95cc 100644 (file)
--- a/sysdeps/unix/sysv/linux/sys/timex.h
+++ b/sysdeps/unix/sysv/linux/sys/timex.h
@@ -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));