From bd7f48571d8bca9fd9072aad409c30e0e2cbc2e0 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 30 Jul 2008 16:33:19 +0000 Subject: * nscd/connections.c (nscd_init): Type if preprocessor directive. * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_PACCEPT): Define. --- ChangeLog | 5 +++++ nptl/ChangeLog | 4 ++++ nptl/tst-align2.c | 2 ++ nscd/connections.c | 2 +- sysdeps/unix/sysv/linux/kernel-features.h | 1 + 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index af29605..962f83d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-07-30 Ulrich Drepper + * 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 diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 346db28..0ecbce3 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,7 @@ +2008-07-30 Ulrich Drepper + + * tst-align2.c (f): Print message that f is reached. + 2008-04-28 Hiroki Kaminaga [BZ #6740] diff --git a/nptl/tst-align2.c b/nptl/tst-align2.c index 9c300ec..9112bdc 100644 --- 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 a1b92f4..8281533 100644 --- 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 df87ae7..271b3fc 100644 --- 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 -- cgit v1.1