summaryrefslogtreecommitdiff
path: root/lib/getugroups.c
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2015-07-04 17:17:09 +0300
committerIgor Pashev <pashev.igor@gmail.com>2015-07-04 17:17:09 +0300
commitcc78bdc31749e9754120ae5a9d4849f4832b40a4 (patch)
tree4f9e3f2064e56651ed8d41ae9d8ce8b08fc5241b /lib/getugroups.c
parent8425beb209e6fedf50bcdd934ced14dfa0d7b596 (diff)
parent71cd8e3a743046573744123777061b64881bf372 (diff)
downloadcoreutils-cc78bdc31749e9754120ae5a9d4849f4832b40a4.tar.gz
Merge tag 'upstream/8.24'
Upstream version 8.24 Conflicts: INSTALL Makefile.in aclocal.m4 build-aux/config.guess build-aux/config.rpath build-aux/config.sub build-aux/depcomp build-aux/missing build-aux/test-driver build-aux/texinfo.tex doc/coreutils.info doc/stamp-vti doc/version.texi gnulib-tests/Makefile.in po/Makefile.in.in
Diffstat (limited to 'lib/getugroups.c')
-rw-r--r--lib/getugroups.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/getugroups.c b/lib/getugroups.c
index d6634baf..7c6d34c9 100644
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -1,6 +1,6 @@
/* getugroups.c -- return a list of the groups a user is in
- Copyright (C) 1990-1991, 1998-2000, 2003-2014 Free Software Foundation, Inc.
+ Copyright (C) 1990-1991, 1998-2000, 2003-2015 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
@@ -27,10 +27,13 @@
#include <string.h>
#include <unistd.h>
-#if !HAVE_GRP_H
+#if !HAVE_GRP_H || defined __ANDROID__
/* Mingw lacks all things related to group management. The best we
- can do is fail with ENOSYS. */
+ can do is fail with ENOSYS.
+
+ Bionic declares e.g. getgrent() in <grp.h> but it isn't actually
+ defined in the library. */
int
getugroups (int maxcount _GL_UNUSED,