about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--locale/loadarchive.c2
-rw-r--r--locale/localeinfo.h2
3 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b41d5cf37..1918620a36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-11  Roland McGrath  <roland@redhat.com>
+
+	* locale/loadarchive.c (LOCALEDIR): Remove debugging defn.  Oops.
+
 2002-08-10  Roland McGrath  <roland@redhat.com>
 
 	* locale/loadarchive.c (_nl_archive_subfreeres): New function.
diff --git a/locale/loadarchive.c b/locale/loadarchive.c
index a9b5386ce8..ad06f12438 100644
--- a/locale/loadarchive.c
+++ b/locale/loadarchive.c
@@ -37,8 +37,6 @@
 #include "hashval.h"
 #undef compute_hashval
 
-#undef LOCALEDIR
-#define LOCALEDIR "/spare/roland/tmp/usr/lib/locale/"
 
 /* Name of the locale archive file.  */
 static const char archfname[] = LOCALEDIR "locale-archive";
diff --git a/locale/localeinfo.h b/locale/localeinfo.h
index bcb5805854..44a10e1ca6 100644
--- a/locale/localeinfo.h
+++ b/locale/localeinfo.h
@@ -262,7 +262,7 @@ extern struct locale_data *_nl_load_locale_from_archive (int category,
      internal_function attribute_hidden;
 
 /* Subroutine of setlocale's __libc_subfreeres hook.  */
-extern void _nl_archive_subfrees (void) attribute_hidden;
+extern void _nl_archive_subfreeres (void) attribute_hidden;
 
 /* Validate the contents of a locale file and set up the in-core
    data structure to point into the data.  This leaves the `alloc'