diff --git a/ChangeLog b/ChangeLog
index 8066a69a54..da002f6438 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-28  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/unix/sysv/linux/getdents.c: Add _syscall_getdents64
+	declaration, adjust declaration of __syscall_getdents to match
+	kernel.
+
 2000-11-29  H.J. Lu  <hjl@gnu.org>
 
 	* sysdeps/generic/readelflib.c (check_ptr): Undefine it first.
diff --git a/Makeconfig b/Makeconfig
index b47ccda686..c26e9c7df5 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -698,7 +698,7 @@ ifeq (yes, $(build-shared))
 # %ifdef et al based on config.h settings or other %include'd files.
 define preprocess-versions
 sed 's/#.*$$//;s/^[ 	]*%/#/' \
-| $(CC) -E -undef -I$(common-objdir) -I$(..)include \
+| $(CC) -E -undef -traditional-cpp -I$(common-objdir) -I$(..)include \
 		  -include $(common-objpfx)config.h \
 		  -x c - \
 | sed 's/#.*$$//;/^[ 	]*$$/d'
diff --git a/configure b/configure
index 2157444dfd..3e114864cc 100755
--- a/configure
+++ b/configure
@@ -2175,7 +2175,7 @@ else
 fi
 
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
diff --git a/sysdeps/unix/sysv/linux/getdents.c b/sysdeps/unix/sysv/linux/getdents.c
index fc55c27ebf..78dea244fd 100644
--- a/sysdeps/unix/sysv/linux/getdents.c
+++ b/sysdeps/unix/sysv/linux/getdents.c
@@ -48,7 +48,8 @@ extern int __have_no_getdents64;
 
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 
-extern int __syscall_getdents (int fd, char *__unbounded buf, size_t nbytes);
+extern int __syscall_getdents (int fd, char *__unbounded buf, unsigned int nbytes);
+extern int __syscall_getdents64 (int fd, char *__unbounded buf, unsigned int nbytes);
 
 /* For Linux we need a special version of this file since the
    definition of `struct dirent' is not the same for the kernel and