OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update.

Browse Source 
* locale/Versions [libc] (GLIBC_2.2): Add localeconv.
	* locale/localeconv.c: Make function versioned (with same definition).
This commit is contained in:
Ulrich Drepper 2000-05-30 20:37:26 +00:00
parent a907bff941
commit 9b014809fa
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2000-05-30 Ulrich Drepper <drepper@redhat.com> 2000-05-30 Ulrich Drepper <drepper@redhat.com>
* locale/Versions [libc] (GLIBC_2.2): Add localeconv.
* locale/localeconv.c: Make function versioned (with same definition).
* elf/Makefile (modules-names): Strip before using it. * elf/Makefile (modules-names): Strip before using it.
2000-05-30 Andreas Jaeger <aj@suse.de> 2000-05-30 Andreas Jaeger <aj@suse.de>

7
elf/Makefile
View File

@ -88,8 +88,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
testobj1_1 failobj constload2 constload3 \ testobj1_1 failobj constload2 constload3 \
dep1 dep2 dep3 dep4 $(modules-vis-$(have-protected)) dep1 dep2 dep3 dep4 $(modules-vis-$(have-protected))
modules-vis-yes = vismod1 vismod2 vismod3 modules-vis-yes = vismod1 vismod2 vismod3
modules-names := $(strip $(module-names)) extra-objs += $(addsuffix .os,$(strip $(modules-names)))
extra-objs += $(modules-names:=.os)
include ../Rules include ../Rules
@ -213,8 +212,8 @@ $(objpfx)sprof: $(libdl)
$(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names))) test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names))))
generated += $(addsuffix .so,$(modules-names)) generated += $(addsuffix .so,$(strip $(modules-names)))
$(objpfx)testobj1.so: $(libdl) $(objpfx)testobj1.so: $(libdl)
$(objpfx)testobj1_1.so: $(objpfx)testobj1.so $(libdl) $(objpfx)testobj1_1.so: $(objpfx)testobj1.so $(libdl)

4
locale/Versions
View File

@ -27,4 +27,8 @@ libc {
# functions from the experimental locale implementation # functions from the experimental locale implementation
__*_l; __newlocale; __duplocale; __freelocale; __*_l; __newlocale; __duplocale; __freelocale;
} }
GLIBC_2.2 {
# The data structure changed.
localeconv;
}
} }

9
locale/localeconv.c
View File

@ -18,10 +18,11 @@
#include <locale.h> #include <locale.h>
#include "localeinfo.h" #include "localeinfo.h"
#include <shlib-compat.h>
/* Return monetary and numeric information about the current locale. */ /* Return monetary and numeric information about the current locale. */
struct lconv * struct lconv *
localeconv (void) __localeconv (void)
{ {
static struct lconv result; static struct lconv result;
@ -56,3 +57,9 @@ localeconv (void)
return &result; return &result;
} }
versioned_symbol (libc, __localeconv, localeconv, GLIBC_2_2);
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
strong_alias (__localeconv, __localeconv20)
compat_symbol (libc, __localeconv20, localeconv, GLIBC_2_0);
#endif