mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 05:20:06 +00:00
f0be25b633
xlocale.h is already a single-type micro-header, defining struct
__locale_struct and the typedefs __locale_t and locale_t. This patch
brings it into the bits/types/ scheme: there are now
bits/types/__locale_t.h which defines only __locale_struct and
__locale_t, and bits/types/locale_t.h which defines locale_t as well
as the other two. None of *our* headers need __locale_t.h, but it
appears to me that libstdc++ could make use of it.
There are a lot of external uses of xlocale.h, but all the uses I
checked had an autoconf test or equivalent for its existence. It has
never been available from other C libraries, and it has always
contained a comment reading "This file is not standardized, don't rely
on it, it can go away without warning" so I think dropping it is
pretty safe.
I also took the opportunity to clean up comments in various public
header files that still talk about the *_l interfaces as though they
were completely nonstandard. There are a few of them, notably the
strtoX_l and wcstoX_l families, that haven't been standardized, but
the bulk are in POSIX.1-2008.
* locale/xlocale.h: Rename to...
* locale/bits/types/__locale_t.h: ...here. Adjust commentary.
Only define struct __locale_struct and __locale_t, not locale_t.
* locale/bits/types/locale_t.h: New file; define locale_t here.
* locale/Makefile (headers): Update to match.
* include/xlocale.h: Delete wrapper.
* include/bits/types/__locale_t.h: New wrapper.
* include/bits/types/locale_t.h: New wrapper.
* ctype/ctype.h, include/printf.h, include/time.h
* locale/langinfo.h, locale/locale.h, stdlib/monetary.h
* stdlib/stdlib.h, string/string.h, string/strings.h, time/time.h
* wcsmbs/wchar.h, wctype/wctype.h: Use bits/types/locale_t.h.
Correct outdated comments regarding the standardization status of
the functions that take locale_t arguments.
* stdlib/strtod_l.c, stdlib/strtof_l.c, stdlib/strtol_l.c
* stdlib/strtold_l.c, stdlib/strtoul_l.c, stdlib/strtoull_l.c
* sysdeps/ieee754/ldbl-128ibm/strtold_l.c
* sysdeps/ieee754/ldbl-64-128/strtold_l.c
* wcsmbs/wcstod.c, wcsmbs/wcstod_l.c, wcsmbs/wcstof.c
* wcsmbs/wcstof_l.c, wcsmbs/wcstold.c, wcsmbs/wcstold_l.c:
Don't include xlocale.h. If necessary, include locale.h instead.
* stdlib/strtold_l.c: Unconditionally include wchar.h.
106 lines
3.6 KiB
Makefile
106 lines
3.6 KiB
Makefile
# Copyright (C) 1991-2017 Free Software Foundation, Inc.
|
|
# This file is part of the GNU C Library.
|
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2.1 of the License, or (at your option) any later version.
|
|
|
|
# The GNU C Library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with the GNU C Library; if not, see
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
#
|
|
# Makefile for locales.
|
|
#
|
|
subdir := locale
|
|
|
|
include ../Makeconfig
|
|
|
|
headers = langinfo.h locale.h bits/locale.h \
|
|
bits/types/locale_t.h bits/types/__locale_t.h
|
|
routines = setlocale findlocale loadlocale loadarchive \
|
|
localeconv nl_langinfo nl_langinfo_l mb_cur_max \
|
|
newlocale duplocale freelocale uselocale
|
|
tests = tst-C-locale tst-locname tst-duplocale
|
|
categories = ctype messages monetary numeric time paper name \
|
|
address telephone measurement identification collate
|
|
aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \
|
|
xlocale localename global-locale coll-lookup
|
|
others = localedef locale
|
|
#others-static = localedef locale
|
|
install-bin = localedef locale
|
|
extra-objs = $(localedef-modules:=.o) $(localedef-aux:=.o) \
|
|
$(locale-modules:=.o) $(lib-modules:=.o)
|
|
|
|
extra-libs = libBrokenLocale
|
|
extra-libs-others = $(extra-libs)
|
|
|
|
libBrokenLocale-routines = broken_cur_max
|
|
|
|
subdir-dirs = programs
|
|
vpath %.c programs ../crypt
|
|
vpath %.h programs
|
|
vpath %.gperf programs
|
|
|
|
localedef-modules := localedef $(categories:%=ld-%) \
|
|
charmap linereader locfile \
|
|
repertoire locarchive
|
|
localedef-aux := md5
|
|
locale-modules := locale locale-spec
|
|
lib-modules := charmap-dir simple-hash xmalloc xstrdup
|
|
|
|
|
|
GPERF = gperf
|
|
GPERFFLAGS = -acCgopt -k1,2,5,9,$$ -L ANSI-C
|
|
|
|
include ../Rules
|
|
|
|
CFLAGS-md5.c = -I../crypt
|
|
|
|
programs/%-kw.h: programs/%-kw.gperf
|
|
cd programs \
|
|
&& $(GPERF) $(GPERFFLAGS) -N $(@F:-kw.h=_hash) $(<F) > $(@F).new
|
|
mv -f $@.new $@
|
|
|
|
$(objpfx)localedef: $(localedef-modules:%=$(objpfx)%.o)
|
|
$(objpfx)localedef: $(localedef-aux:%=$(objpfx)%.o)
|
|
$(objpfx)locale: $(locale-modules:%=$(objpfx)%.o)
|
|
$(objpfx)localedef $(objpfx)locale: $(lib-modules:%=$(objpfx)%.o)
|
|
|
|
C-translit.h: C-translit.h.in gen-translit.pl
|
|
$(PERL) gen-translit.pl < $< > $@.tmp
|
|
mv -f $@.tmp $@
|
|
|
|
# The path to the compiled binary locale archive or compiled locales,
|
|
# along with the parent path to the source locales and source
|
|
# charmaps.
|
|
localepath = "$(complocaledir):$(i18ndir)"
|
|
|
|
# -Iprograms doesn't really belong here, but this gets it at the head
|
|
# of the list instead of the tail, where CPPFLAGS-$(lib) gets added.
|
|
# We need it before the standard -I's to see programs/config.h first.
|
|
locale-CPPFLAGS = -DCOMPLOCALEDIR='"$(complocaledir)"' \
|
|
-DLOCALE_ALIAS_PATH='"$(localedir)"' \
|
|
-Iprograms
|
|
|
|
CPPFLAGS-locale-programs = -DLOCALE_PATH='$(localepath)' \
|
|
-DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
|
|
-DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
|
|
-DLOCSRCDIR='"$(i18ndir)/locales"'
|
|
|
|
CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts
|
|
CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts
|
|
CFLAGS-charmap-dir.c = -Wno-write-strings
|
|
|
|
# Set libof-* for each routine.
|
|
cpp-srcs-left := $(localedef-modules) $(localedef-aux) $(locale-modules) \
|
|
$(lib-modules)
|
|
lib := locale-programs
|
|
include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
|