diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-24 02:51:45 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-24 02:51:45 +0000 |
| commit | d2db9bdb4c79afcd4b09353346cd4eaf63b6cd2c (patch) | |
| tree | 6f5cb1fa2fc62027df2614e8f8498f3eea8bc465 /libc/misc/wchar | |
| parent | e116018ce23fc3dcee95c2c23f9f4f7b54acd92e (diff) | |
| download | uClibc-alpine-d2db9bdb4c79afcd4b09353346cd4eaf63b6cd2c.tar.bz2 uClibc-alpine-d2db9bdb4c79afcd4b09353346cd4eaf63b6cd2c.tar.xz | |
Merge from trunk and bring in NPTL code in the various 'misc' subsystems.
Diffstat (limited to 'libc/misc/wchar')
| -rw-r--r-- | libc/misc/wchar/Makefile.in | 5 | ||||
| -rw-r--r-- | libc/misc/wchar/wchar.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/libc/misc/wchar/Makefile.in b/libc/misc/wchar/Makefile.in index 64171eb96..7b408b3a0 100644 --- a/libc/misc/wchar/Makefile.in +++ b/libc/misc/wchar/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. @@ -9,7 +8,7 @@ # The stdio and time related wide functions are now built in the normal # directories. # -# stdio: +# stdio: # fwide fgetwc getwchar fgetws fputwc putwchar fputws ungetwc # getwc (fgetwc alias) getwc_unlocked (fgetwc_unlocked alias) # putwc (fputwc alias) putwc_unlocked (fputwc_unlocked alias) @@ -33,6 +32,8 @@ MISC_WCHAR_SRC := $(patsubst %.c,$(MISC_WCHAR_DIR)/%.c,$(CSRC)) MISC_WCHAR_OBJ := $(patsubst %.c,$(MISC_WCHAR_OUT)/%.o,$(CSRC)) libc-$(UCLIBC_HAS_WCHAR) += $(MISC_WCHAR_OBJ) +libc-a-$(UCLIBC_HAS_WCHAR) += $(MISC_WCHAR_OBJ) +libc-so-$(UCLIBC_HAS_WCHAR) += $(MISC_WCHAR_OBJ:.o=.os) objclean-y += misc_wchar_objclean diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c index a795986e8..32ad41ee6 100644 --- a/libc/misc/wchar/wchar.c +++ b/libc/misc/wchar/wchar.c @@ -98,7 +98,6 @@ * Manuel */ -#define _ISOC99_SOURCE #include <errno.h> #include <stddef.h> #include <limits.h> @@ -111,9 +110,6 @@ #include <wchar.h> #include <bits/uClibc_uwchar.h> -#ifdef __UCLIBC_HAS_LOCALE__ -libc_hidden_proto(__global_locale) -#endif /**********************************************************************/ #ifdef __UCLIBC_HAS_LOCALE__ #ifdef __UCLIBC_MJN3_ONLY__ @@ -1195,6 +1191,7 @@ typedef struct { #include <iconv.h> #include <string.h> +#include <strings.h> #include <endian.h> #include <byteswap.h> |