From 2e79213a366ad807b054ca167266ed4827303836 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 20 Jul 2008 17:11:28 +0000 Subject: [PATCH] * locale/setlocale.c (setname): Remove inline to avoid compiler warning. --- ChangeLog | 3 +++ locale/setlocale.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c90a2e8099..41a8f97e83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-07-20 Ulrich Drepper + * locale/setlocale.c (setname): Remove inline to avoid compiler + warning. + * locale/setlocale.c (setlocale): Take the setlocale lock earlier. 2008-07-15 Ulrich Drepper diff --git a/locale/setlocale.c b/locale/setlocale.c index 76cae82a72..05a55a96ed 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c @@ -193,7 +193,7 @@ new_composite_name (int category, const char *newnames[__LC_LAST]) /* Put NAME in _nl_global_locale.__names. */ -static inline void +static void setname (int category, const char *name) { if (_nl_global_locale.__names[category] == name)