From: Richard Henderson <rth@twiddle.net>
Date: Fri, 26 Mar 2010 16:21:34 +0000 (-0700)
Subject: Finish locale_data -> __locale_data transition.
X-Git-Tag: fedora/glibc-2.11.90-17~2^2~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e9331df8bb546363724aaf50d8b023a0167c06d;p=thirdparty%2Fglibc.git

Finish locale_data -> __locale_data transition.

The transition that was begun here
f095bb7204d80f609a73a22796edd6cffd4c6add
was not complete.

Signed-off-by: Richard Henderson <rth@twiddle.net>
---

diff --git a/ChangeLog b/ChangeLog
index 72cbef6681f..23393e67636 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-26  Richard Henderson  <rth@redhat.com>
+
+	* locale/setlocale.c (free_category): Finish renaming
+	struct locale_data to __locale_data.
+
 2010-03-26  Richard Henderson  <rth@redhat.com>
 
 	* csu/gmon-start.c (ENTRY_POINT, etext): Declare as char[], not void.
diff --git a/locale/setlocale.c b/locale/setlocale.c
index 4ebce782441..46372fdcac0 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -465,7 +465,7 @@ libc_hidden_def (setlocale)
 
 static void __libc_freeres_fn_section
 free_category (int category,
-	       struct __locale_data *here, struct locale_data *c_data)
+	       struct __locale_data *here, struct __locale_data *c_data)
 {
   struct loaded_l10nfile *runp = _nl_locale_file_list[category];
 
@@ -481,7 +481,7 @@ free_category (int category,
   while (runp != NULL)
     {
       struct loaded_l10nfile *curr = runp;
-      struct __locale_data *data = (struct locale_data *) runp->data;
+      struct __locale_data *data = (struct __locale_data *) runp->data;
 
       if (data != NULL && data != c_data)
 	_nl_unload_locale (data);