This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.14-380-g97c066e
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 17 Oct 2011 14:30:31 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-380-g97c066e
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 97c066e65af5d0a52d794d7fd81d7242ee46c49c (commit)
from 49a43d80ec5c97cf6136b1ee2687414773b2d5aa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=97c066e65af5d0a52d794d7fd81d7242ee46c49c
commit 97c066e65af5d0a52d794d7fd81d7242ee46c49c
Author: Ulrich Drepper <drepper@gmail.com>
Date: Mon Oct 17 10:30:03 2011 -0400
Fix nesting of #ifdefs in netgroupcache.c
diff --git a/ChangeLog b/ChangeLog
index 32a6a5d..755ca1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-17 Ulrich Drepper <drepper@gmail.com>
+
+ * nscd/netgroupcache.c (addgetnetgrentX): Fix #ifdef nesting.
+
2011-10-17 Andreas Schwab <schwab@redhat.com>
* misc/sys/cdefs.h: Fix last change.
diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c
index a406ade..02cda13 100644
--- a/nscd/netgroupcache.c
+++ b/nscd/netgroupcache.c
@@ -406,10 +406,10 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req,
# endif
}
else
+#endif
{
-# ifndef __ASSUME_SENDFILE
+#if defined HAVE_SENDFILE && !defined __ASSUME_SENDFILE
use_write:
-# endif
#endif
writeall (fd, &dataset->resp, dataset->head.recsize);
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
nscd/netgroupcache.c | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources