update from main archive 961208

diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index 40f65b8..425fb58 100644 (file)
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -1,4 +1,5 @@
 init-first.h
+llseek.c
 siglist.h
 sysctl.c
 termio.h

diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index 6f3d181..ddf8663 100644 (file)
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -20,7 +20,7 @@ else
 #include "confdefs.h"
 #include <linux/version.h>
 int main() {
-#if LINUX_VERSION_CODE <  ( *65536+ 0 *256+ 10) /* .0.10 */
+#if LINUX_VERSION_CODE <  (2 *65536+ 0 *256+ 10) /* 2.0.10 */
 eat flaming death
 #endif
 ; return 0; }

diff --git a/time/Makefile b/time/Makefile
index 6ad2be8..e55b664 100644 (file)
--- a/time/Makefile
+++ b/time/Makefile
@@ -147,6 +147,6 @@ CFLAGS-ialloc.c = -Wno-strict-prototypes -DNOID
 CFLAGS-scheck.c = -Wno-strict-prototypes -DNOID
 CFLAGS-tzfile.c = $(tz-cflags)
 
-ifneq ($(malloc),new-malloc)
+ifeq ($(malloc),new-malloc)
 CFLAGS-ap.c = -DNO_MCHECK
 endif