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 72cbef6681fc2c9f7e7489b08030649b7e2f3f2f..23393e6763604baa626a0c63ccb5b12e19712f56 100644 (file)
--- 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 4ebce78244128592b376ca4d05ea46e8f108e553..46372fdcac0cd49e49e2e03b58b6fc9467f30c55 100644 (file)
--- 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);