diff options
| author | jimb <jimb@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-10-30 10:27:35 +0000 |
|---|---|---|
| committer | jimb <jimb@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-10-30 10:27:35 +0000 |
| commit | 6fb2c4ac7592f6b0d097709daeb7170ed74d0bc0 (patch) | |
| tree | e9d6d9b6383b860dfa1caf343096cccdb28ff766 /libc/wcsmbs | |
| parent | ed4a76ca96808ab39057863ff97dcc033eaa5496 (diff) | |
| download | eglibc2-6fb2c4ac7592f6b0d097709daeb7170ed74d0bc0.tar.gz | |
* Makeconfig ($(common-objpfx)gnu/option-groups.h): New generated
header.
* scripts/option-groups.awk: New script, to generate it.
* debug/Makefile (CFLAGS-segfault.c): Don't define option group
symbols here.
* wcsmbs/Makefile (CFLAGS-wcsmbsload.c): Same.
* time/Makefile (CFLAGS-strftime_l.c, CFLAGS-strptime_l.c): Same.
* intl/Makefile (CFLAGS-dcigettext.c): Same.
* sysdeps/unix/sysv/linux/Makefile (CFLAGS-gethostid.c)
(CFLAGS-libc_fatal.c): Same.
* misc/Makefile (CFLAGS-error.c, CFLAGS-err.c): Same.
* nss/Makefile (CFLAGS-nsswitch.c, CFLAGS-getnssent_r.c)
(CFLAGS-getent.c): Same.
* string/Makefile (CFLAGS-strerror_l.c): Same.
* iconv/Makefile (CFLAGS-gconv_db.c, CFLAGS-gconv_trans.c)
(CFLAGS-iconv_prog.c): Same.
* locale/Makefile (CFLAGS-C-ctype.c, CFLAGS-xlocale.c)
(CFLAGS-ld-messages.c): Same.
* argp/Makefile (CFLAGS-argp-help.c, CFLAGS-argp-fmtstream.c): Same.
* nptl/Makefile (CFLAGS-pthread_create.c): Same.
* posix/Makefile (CFLAGS-glob.c, CFLAGS-bug-regex1.c): Same.
* stdio-common/Makefile (CFLAGS-printf_fp.c)
(CFLAGS-printf_fphex.c, CFLAGS-fxprintf.c, CFLAGS-tst-popen.c): Same.
* libidn/Makefile (CFLAGS-toutf8.c): Same.
* debug/segfault.c, wcsmbs/wcsmbsload.c, time/strftime_l.c:
* time/strptime_l.c, intl/dcigettext.c:
* sysdeps/unix/sysv/linux/libc_fatal.c:
* sysdeps/unix/sysv/linux/gethostid.c, misc/err.c, misc/error.c:
* nss/getnssent_r.c, nss/nsswitch.c, nss/getent.c:
* string/strerror_l.c, iconv/gconv_db.c, iconv/iconv_prog.c:
* iconv/gconv_trans.c, locale/xlocale.c, locale/C-ctype.c:
* locale/programs/ld-messages.c, argp/argp-help.c:
* argp/argp-fmtstream.c, nptl/pthread_create.c, posix/glob.c:
* posix/bug-regex1.c, stdio-common/printf_fp.c:
* stdio-common/printf_fphex.c, stdio-common/tst-popen.c:
* stdio-common/fxprintf.c, libidn/toutf8.c: #include
<gnu/option-groups.h>, and test for the symbols that #defines,
instead.
git-svn-id: svn://svn.eglibc.org/trunk@4026 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/wcsmbs')
| -rw-r--r-- | libc/wcsmbs/Makefile | 4 | ||||
| -rw-r--r-- | libc/wcsmbs/wcsmbsload.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/libc/wcsmbs/Makefile b/libc/wcsmbs/Makefile index 4efaeb0a6..1f27dff4e 100644 --- a/libc/wcsmbs/Makefile +++ b/libc/wcsmbs/Makefile @@ -72,10 +72,6 @@ CFLAGS-wcstold_l.c = $(strtox-CFLAGS) CFLAGS-wcstof_l.c = $(strtox-CFLAGS) CFLAGS-tst-wchar-h.c = -D_FORTIFY_SOURCE=2 -OPTION_EGLIBC_LOCALE_CODE-CFLAGS-$(OPTION_EGLIBC_LOCALE_CODE) \ - = -DOPTION_EGLIBC_LOCALE_CODE -CFLAGS-wcsmbsload.c = $(OPTION_EGLIBC_LOCALE_CODE-CFLAGS-y) - CFLAGS-isoc99_wscanf.c += $(exceptions) CFLAGS-isoc99_fwscanf.c += $(exceptions) CFLAGS-isoc99_vwscanf.c += $(exceptions) diff --git a/libc/wcsmbs/wcsmbsload.c b/libc/wcsmbs/wcsmbsload.c index 97ca0a240..6531775ce 100644 --- a/libc/wcsmbs/wcsmbsload.c +++ b/libc/wcsmbs/wcsmbsload.c @@ -22,6 +22,7 @@ #include <limits.h> #include <stdlib.h> #include <string.h> +#include <gnu/option-groups.h> #include <locale/localeinfo.h> #include <wcsmbsload.h> @@ -144,7 +145,7 @@ __wcsmbs_getfct (const char *to, const char *from, size_t *nstepsp) }) -#ifdef OPTION_EGLIBC_LOCALE_CODE +#if __OPTION_EGLIBC_LOCALE_CODE /* Some of the functions here must not be used while setlocale is called. */ __libc_lock_define (extern, __libc_setlocale_lock attribute_hidden) |