about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--locale/Versions7
-rw-r--r--sysdeps/gnu/bits/utmp.h2
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b547f7a9ce..29895bea57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1998-12-05  Ulrich Drepper  <drepper@cygnus.com>
 
+	* locale/Versions: Make experimental locale interface available in
+	GLIBC_2.1.
+
 	* sysdeps/gnu/bits/utmp.h (struct exit_status): Define members
 	without leading __ only for __USE_GNU.
 	* sysdeps/gnu/bits/utmpx.h (struct __exit_status): Likewise.
diff --git a/locale/Versions b/locale/Versions
index bccb3cbb9d..6e3b166905 100644
--- a/locale/Versions
+++ b/locale/Versions
@@ -11,9 +11,6 @@ libc {
     __collate_symbol_classes; __collate_symbol_hash; __collate_symbol_strings;
     _libc_intl_domainname; _nl_current_LC_COLLATE; _nl_current_LC_CTYPE;
 
-    # functions from the experimental locale implementation
-    __*_l; __newlocale; __duplocale; __freelocale;
-
     # functions used in inline functions or macros
     __ctype_get_mb_cur_max;
 
@@ -26,4 +23,8 @@ libc {
     # s*
     setlocale;
   }
+  GLIBC_2.1 {
+    # functions from the experimental locale implementation
+    __*_l; __newlocale; __duplocale; __freelocale;
+  }
 }
diff --git a/sysdeps/gnu/bits/utmp.h b/sysdeps/gnu/bits/utmp.h
index a5fabb1dd7..743257d302 100644
--- a/sysdeps/gnu/bits/utmp.h
+++ b/sysdeps/gnu/bits/utmp.h
@@ -63,7 +63,7 @@ struct utmp
   char ut_id[4];		/* Inittab ID.  */
   char ut_user[UT_NAMESIZE];	/* Username.  */
   char ut_host[UT_HOSTSIZE];	/* Hostname for remote login.  */
-  struct __exit_status ut_exit;	/* Exit status of a process marked
+  struct exit_status ut_exit;	/* Exit status of a process marked
 				   as DEAD_PROCESS.  */
   long int ut_session;		/* Session ID, used for windowing.  */
   struct timeval ut_tv;		/* Time entry was made.  */