getgroups: fix compilation when getgroups is available

* lib/getgroups.c (includes): Include <unistd.h> for getgroups,
but with <config.h> override of getgroups disabled.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index c32c1eb..b59412e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-24  Eric Blake  <ebb9@byu.net>
+
+       getgroups: fix compilation when getgroups is available
+       * lib/getgroups.c (includes): Include <unistd.h> for getgroups,
+       but with <config.h> override of getgroups disabled.
+
 2008-10-24  Simon Josefsson  <simon@josefsson.org>
 
        * doc/gnulib.texi (Header files): Add note about C++ problems.

diff --git a/lib/getgroups.c b/lib/getgroups.c
index a8a225a..1e9cbc6 100644 (file)
--- a/lib/getgroups.c
+++ b/lib/getgroups.c
@@ -1,6 +1,7 @@
 /* provide consistent interface to getgroups for systems that don't allow N==0
 
-   Copyright (C) 1996, 1999, 2003, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1999, 2003, 2006, 2007, 2008 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,10 +20,13 @@
 
 #include <config.h>
 
+#undef getgroups
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include "xalloc.h"
 
@@ -38,8 +42,6 @@ rpl_getgroups (int n, GETGROUPS_T *group)
   GETGROUPS_T *gbuf;
   int saved_errno;
 
-#undef getgroups
-
   if (n != 0)
     return getgroups (n, group);