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/ttyent | |
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/ttyent')
-rw-r--r-- | libc/misc/ttyent/Makefile.in | 2 | ||||
-rw-r--r-- | libc/misc/ttyent/getttyent.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libc/misc/ttyent/Makefile.in b/libc/misc/ttyent/Makefile.in index 288a4c09b..ece277609 100644 --- a/libc/misc/ttyent/Makefile.in +++ b/libc/misc/ttyent/Makefile.in @@ -14,6 +14,8 @@ MISC_TTYENT_SRC := $(patsubst %.c,$(MISC_TTYENT_DIR)/%.c,$(CSRC)) MISC_TTYENT_OBJ := $(patsubst %.c,$(MISC_TTYENT_OUT)/%.o,$(CSRC)) libc-y += $(MISC_TTYENT_OBJ) +libc-a-y += $(MISC_TTYENT_OBJ) +libc-so-y += $(MISC_TTYENT_OBJ:.o=.os) objclean-y += misc_ttyent_objclean diff --git a/libc/misc/ttyent/getttyent.c b/libc/misc/ttyent/getttyent.c index e9cc9be2a..89c39876f 100644 --- a/libc/misc/ttyent/getttyent.c +++ b/libc/misc/ttyent/getttyent.c @@ -51,7 +51,7 @@ libc_hidden_proto(fclose) libc_hidden_proto(abort) #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) #endif |