aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-01-28 13:53:14 +0000
committerUlrich Drepper <drepper@redhat.com>1999-01-28 13:53:14 +0000
commitd328b80b4e2620e0f34271a069b09c05ac16831d (patch)
tree1a4411dde3519fd834471a3ae11afc7366c1eb56
parent51e176c2c2cd6d62d7619efb4aab569ded5a2416 (diff)
downloadglibc-d328b80b4e2620e0f34271a069b09c05ac16831d.tar
glibc-d328b80b4e2620e0f34271a069b09c05ac16831d.tar.gz
glibc-d328b80b4e2620e0f34271a069b09c05ac16831d.tar.bz2
glibc-d328b80b4e2620e0f34271a069b09c05ac16831d.zip
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>
-rw-r--r--ChangeLog12
-rw-r--r--libio/genops.c2
-rw-r--r--libio/getc_u.c3
-rw-r--r--sysdeps/unix/sysv/linux/sys/timex.h5
4 files changed, 18 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e26dab147c..91e27dadb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
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
_IO_MTSAFE_IO is not defined.
diff --git a/libio/genops.c b/libio/genops.c
index f925b0d87b..81752e3ccc 100644
--- 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 5572ef6b3e..a722a315f2 100644
--- 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 7e2a475128..900341e545 100644
--- 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));