Fix nesting of #ifdefs in netgroupcache.c

diff --git a/ChangeLog b/ChangeLog
index 32a6a5dafd9f6ea2986ab4591a104a82f11fcccf..755ca1d99f754aa94d539289083d0c90c8e4919e 100644 (file)
--- 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 a406ade995093584e715131f0f0e6103bb18607b..02cda13644c85ff5d14f703e522758d0707093c4 100644 (file)
--- 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);
        }