aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-10-17 10:30:03 -0400
committerUlrich Drepper <drepper@gmail.com>2011-10-17 10:30:03 -0400
commit97c066e65af5d0a52d794d7fd81d7242ee46c49c (patch)
tree5bb81b6b35b549b8c97866b94f5f1499777b38b4
parent49a43d80ec5c97cf6136b1ee2687414773b2d5aa (diff)
downloadglibc-97c066e65af5d0a52d794d7fd81d7242ee46c49c.tar
glibc-97c066e65af5d0a52d794d7fd81d7242ee46c49c.tar.gz
glibc-97c066e65af5d0a52d794d7fd81d7242ee46c49c.tar.bz2
glibc-97c066e65af5d0a52d794d7fd81d7242ee46c49c.zip
Fix nesting of #ifdefs in netgroupcache.c
-rw-r--r--ChangeLog4
-rw-r--r--nscd/netgroupcache.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 32a6a5dafd..755ca1d99f 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 a406ade995..02cda13644 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);
}