aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-07-20 17:11:28 +0000
committerUlrich Drepper <drepper@redhat.com>2008-07-20 17:11:28 +0000
commit2e79213a366ad807b054ca167266ed4827303836 (patch)
tree75878fde91e8d8b3d889bb791e408f98f3e06dea
parent9f558b80513ba1314671ccc90620285a8eea6990 (diff)
downloadglibc-2e79213a366ad807b054ca167266ed4827303836.tar
glibc-2e79213a366ad807b054ca167266ed4827303836.tar.gz
glibc-2e79213a366ad807b054ca167266ed4827303836.tar.bz2
glibc-2e79213a366ad807b054ca167266ed4827303836.zip
* locale/setlocale.c (setname): Remove inline to avoid compiler
warning.
-rw-r--r--ChangeLog3
-rw-r--r--locale/setlocale.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c90a2e8099..41a8f97e83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2008-07-20 Ulrich Drepper <drepper@redhat.com>
+ * locale/setlocale.c (setname): Remove inline to avoid compiler
+ warning.
+
* locale/setlocale.c (setlocale): Take the setlocale lock earlier.
2008-07-15 Ulrich Drepper <drepper@redhat.com>
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)