diff options
author | Ulrich Drepper <drepper@redhat.com> | 2008-07-30 16:33:19 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2008-07-30 16:33:19 +0000 |
commit | bd7f48571d8bca9fd9072aad409c30e0e2cbc2e0 (patch) | |
tree | 627d08943183bbb8f5948410f6f691ed22323199 | |
parent | a707cff63d72f4e9d1a755b42444daef78f306b2 (diff) | |
download | glibc-bd7f48571d8bca9fd9072aad409c30e0e2cbc2e0.tar.gz glibc-bd7f48571d8bca9fd9072aad409c30e0e2cbc2e0.tar.xz glibc-bd7f48571d8bca9fd9072aad409c30e0e2cbc2e0.zip |
* nscd/connections.c (nscd_init): Type if preprocessor directive.
* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_PACCEPT): Define.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | nptl/ChangeLog | 4 | ||||
-rw-r--r-- | nptl/tst-align2.c | 2 | ||||
-rw-r--r-- | nscd/connections.c | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/kernel-features.h | 1 |
5 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index af296057d5..962f83da32 100644 --- 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 346db28005..0ecbce3f64 100644 --- 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 9c300ecd1f..9112bdc8f5 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 a1b92f466b..8281533c3b 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 df87ae7c48..271b3fcdd5 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 |