* sysdeps/unix/sysv/linux/check_native.c: Include <asm/types.h>.

	* nscd/mem.c (gc): Don't allocate arrays on the stack if they can
	Return zero in case the thread library is not NPTL.

diff --git a/ChangeLog b/ChangeLog
index 9be98ef862387d89c6eb49ce66098d3bb7e20e37..14afc87dff754f81d64359ef48869a4aaea86103 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-23  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/unix/sysv/linux/check_native.c: Include <asm/types.h>.
+
 2007-11-23  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
        * sysdeps/unix/sysv/linux/Makefile [subdir=inet] (sysdep_headers):
@@ -22,12 +26,12 @@
        [BZ #5382]
        * nscd/nscd.h (NSCD_THREAD_STACKSIZE): Define.
        * nscd/connections.c (start_threads): Use NSCD_THREAD_STACKSIZE.
-       * nscd/mem.c (gc): Don't allocate arrays on stack if it can
+       * nscd/mem.c (gc): Don't allocate arrays on the stack if they can
        overflow it.
        Partially based on a patch by Petr Baudis <pasky@suse.cz>.
 
        * sysdeps/unix/sysv/linux/nscd_setup_thread.c (setup_thread):
-       Return zero in case thread library is not NPTL.
+       Return zero in case the thread library is not NPTL.
 
        [BZ #5375]
        * resolv/res_hconf.c (_res_hconf_reorder_addrs): Fix locking when

diff --git a/sysdeps/unix/sysv/linux/check_native.c b/sysdeps/unix/sysv/linux/check_native.c
index 1ae8dbb0b41470c3eb1c2f8d91629b6a0a7e763d..6e6624abe105d60637280a80915e8e4af8558259 100644 (file)
--- a/sysdeps/unix/sysv/linux/check_native.c
+++ b/sysdeps/unix/sysv/linux/check_native.c
@@ -29,6 +29,7 @@
 #include <net/if_arp.h>
 #include <sys/ioctl.h>
 
+#include <asm/types.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>