* nscd/connections.c (nscd_init): Type if preprocessor directive.

	* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_PACCEPT):
	Define.

diff --git a/ChangeLog b/ChangeLog
index af296057d50b9fac601f703d58b925e53c48638d..962f83da32f1ff1ba749c8bb13fbfeb413bb0d16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-07-30  Ulrich Drepper  <drepper@redhat.com>
 
+       * nscd/connections.c (nscd_init): Type if preprocessor directive.
+
+       * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_PACCEPT):
+       Define.
+
        * misc/syslog.c (openlog_internal): Fix compile problem.
 
 2008-07-28  Roland McGrath  <roland@redhat.com>

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 346db28005e0dd95830e38fc9ff8a6dfb0294fea..0ecbce3f64650b22835ecba3205a67e9b5e14f3a 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-30  Ulrich Drepper  <drepper@redhat.com>
+
+       * tst-align2.c (f): Print message that f is reached.
+
 2008-04-28  Hiroki Kaminaga  <kaminaga@sm.sony.co.jp>
 
        [BZ #6740]

diff --git a/nptl/tst-align2.c b/nptl/tst-align2.c
index 9c300ecd1fc9f0ddea92e971eaa5219f50c67018..9112bdc8f55945d7cc141735632d1cf8d9eb9dfc 100644 (file)
--- a/nptl/tst-align2.c
+++ b/nptl/tst-align2.c
@@ -31,6 +31,8 @@ f (void *arg)
 {
   bool ok = true;
 
+  puts ("in f");
+
   if (TEST_STACK_ALIGN ())
     ok = false;
 

diff --git a/nscd/connections.c b/nscd/connections.c
index a1b92f466b277ef625692e7219bb679ba2586f11..8281533c3bc23b197546df688c52e9aae7e8f5a6 100644 (file)
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -880,7 +880,7 @@ cannot set socket to close on exec: %s; disabling paranoia mode"),
 #endif
     {
       sock = socket (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
-#ifdef __ASSUME_SOCK_CLOEXEC
+#ifndef __ASSUME_SOCK_CLOEXEC
       if (have_sock_cloexec == 0)
        have_sock_cloexec = sock != -1 || errno != EINVAL ? 1 : -1;
 #endif

diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index df87ae7c4847b6febfc7cee075b302f98963f8d9..271b3fcdd50c29ba9aa4da58820d6f4ee2857572 100644 (file)
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -506,4 +506,5 @@
 # define __ASSUME_SOCK_CLOEXEC 1
 # define __ASSUME_IN_NONBLOCK  1
 # define __ASSUME_PIPE2                1
+# define __ASSUME_PACCEPT      1
 #endif