X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetugroups.c;h=6c818f110856553a559b8579cec4e32afa7eb5fc;hb=8cdf507496138203fbf4c3f36c70575825ad7bf1;hp=4ac6dfc87123469fa17b50513d3eed835e02b61e;hpb=43e78b970f396160a887c9da94531569faeda8a0;p=gnulib.git

diff --git a/lib/getugroups.c b/lib/getugroups.c
index 4ac6dfc87..6c818f110 100644
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -12,44 +12,33 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Written by David MacKenzie. */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <sys/types.h>
+#include <stdio.h> /* grp.h on alpha OSF1 V2.0 uses "FILE *". */
 #include <grp.h>
 
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
 
-/* Even though SunOS 4, Ultrix 4, and 386BSD are mostly POSIX.1 compliant,
-   their getgroups system call (except in the `System V' environment, which
-   is troublesome in other ways) fills in an array of int, not gid_t
-   (which is `short' on those systems).  We do the same, for consistency.
-   Kludge, kludge.  */
-
-#ifdef _POSIX_VERSION
-#if !defined(sun) && !defined(ultrix) && !defined(__386BSD__)
-#define GETGROUPS_T gid_t
-#else /* sun or ultrix or 386BSD */
-#define GETGROUPS_T int
-#endif /* sun or ultrix or 386BSD */
-#else /* not _POSIX_VERSION */
-#define GETGROUPS_T int
-#endif /* not _POSIX_VERSION */
-
 /* setgrent, getgrent, and endgrent are not specified by POSIX.1,
    so header files might not declare them.
    If you don't have them at all, we can't implement this function.
    You lose!  */
 struct group *getgrent ();
 
-#if defined(USG) || defined(STDC_HEADERS)
-#include <string.h>
+#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
+# include <string.h>
 #else
-#include <strings.h>
+# include <strings.h>
 #endif
 
 /* Like `getgroups', but for user USERNAME instead of for