diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-05-25 01:06:50 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-05-30 18:02:48 +0200 |
| commit | a5ca1de1eb575294dbc865a2c4ff643efc117ef4 (patch) | |
| tree | aa88756d803a4b71fce5b851ba032f80d29086d1 | |
| parent | ea16c110d8ca67a5460d45600a399078a101ef4f (diff) | |
build: Remove checks for 'getgrouplist' and 'uselocale'.
GNU libc has had them for a long time.
* configure.ac: Remove checks for 'getgrouplist' and 'uselocale'.
* libshouldbeinlibc/idvec-impgids.c (_merge_implied_gids): Remove #ifdef
HAVE_GETGROUPLIST and remove #else arm.
* libthreads/cthreads.c: Remove #ifdef HAVE_USELOCALE, keeping its
bodies.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libshouldbeinlibc/idvec-impgids.c | 14 | ||||
| -rw-r--r-- | libthreads/cthreads.c | 9 |
3 files changed, 4 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index cf8590be..f8856dbe 100644 --- a/configure.ac +++ b/configure.ac @@ -163,9 +163,6 @@ else fi AC_SUBST(VERSIONING) -# Check if libc contains getgrouplist and/or uselocale. -AC_CHECK_FUNCS(getgrouplist uselocale) - # From glibc HEAD, 2007-11-07. AC_CACHE_CHECK(for -fgnu89-inline, libc_cv_gnu89_inline, [dnl diff --git a/libshouldbeinlibc/idvec-impgids.c b/libshouldbeinlibc/idvec-impgids.c index 74d3cc12..d89f4873 100644 --- a/libshouldbeinlibc/idvec-impgids.c +++ b/libshouldbeinlibc/idvec-impgids.c @@ -1,6 +1,6 @@ /* Add gids implied by a user - Copyright (C) 1997, 2001 Free Software Foundation, Inc. + Copyright (C) 1997, 2001, 2014 Free Software Foundation, Inc. Written by Miles Bader <miles@gnu.ai.mit.edu> @@ -56,7 +56,6 @@ _merge_implied_gids (struct idvec *implied_gids, uid_t uid) else { struct idvec *cache = make_idvec (); -#ifdef HAVE_GETGROUPLIST gid_t _gids[NUM_STATIC_GIDS], *gids = _gids; int maxgids = NUM_STATIC_GIDS; int ngids = getgrouplist (pw->pw_name, pw->pw_gid, gids, &maxgids); @@ -79,17 +78,6 @@ _merge_implied_gids (struct idvec *implied_gids, uid_t uid) if (gids != _gids) free (gids); } -#else -#warning "getgrouplist() not available; supplementary group IDs unsupported." - if (! cache) - err = ENOMEM; - else - { - err = idvec_add_new (cache, pw->pw_gid); - if (err) - idvec_free (cache); - } -#endif if (! err) { diff --git a/libthreads/cthreads.c b/libthreads/cthreads.c index aef20bed..1361b8b3 100644 --- a/libthreads/cthreads.c +++ b/libthreads/cthreads.c @@ -150,10 +150,7 @@ #include <cthreads.h> #include <mach/mig_support.h> #include "cthread_internals.h" - -#ifdef HAVE_USELOCALE -# include <locale.h> -#endif +#include <locale.h> /* * Thread status bits. @@ -292,11 +289,11 @@ cthread_body(cproc_t self) /* * Execute the fork request. */ -#ifdef HAVE_USELOCALE + /* A fresh thread needs to be bound to the global locale. */ uselocale (LC_GLOBAL_LOCALE); -#endif + t->result = (*(t->func))(t->arg); } /* |