From: Ulrich Drepper <drepper@gmail.com>
Date: Mon, 17 Oct 2011 14:30:03 +0000 (-0400)
Subject: Fix nesting of #ifdefs in netgroupcache.c
X-Git-Tag: glibc-2.15~219
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97c066e65af5d0a52d794d7fd81d7242ee46c49c;p=thirdparty%2Fglibc.git

Fix nesting of #ifdefs in netgroupcache.c
---

diff --git a/ChangeLog b/ChangeLog
index 32a6a5dafd9..755ca1d99f7 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 a406ade9950..02cda13644c 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);
 	}