[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] build: Remove checks for 'getgrouplist' and 'uselocale'
From: |
Ludovic Courtès |
Subject: |
[PATCH] build: Remove checks for 'getgrouplist' and 'uselocale' |
Date: |
Sun, 25 May 2014 01:10:48 +0200 |
User-agent: |
Gnus/5.130009 (Ma Gnus v0.9) Emacs/24.3 (gnu/linux) |
This patch removes configure checks that have long been unneeded.
OK to apply?
Ludo’.
>From a8b1c2e3c5cd89f26b6856c63fd3ba625a36ad54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 25 May 2014 01:06:50 +0200
Subject: [PATCH] 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.
---
configure.ac | 3 ---
libshouldbeinlibc/idvec-impgids.c | 14 +-------------
libthreads/cthreads.c | 9 +++------
3 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/configure.ac b/configure.ac
index 873ced8..e756496 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,9 +156,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 74d3cc1..d89f487 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 aef20be..1361b8b 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);
}
/*
--
1.8.4
- [PATCH] build: Remove checks for 'getgrouplist' and 'uselocale',
Ludovic Courtès <=