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/assert | |
| 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/assert')
| -rw-r--r-- | libc/misc/assert/Makefile.in | 3 | ||||
| -rw-r--r-- | libc/misc/assert/__assert.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libc/misc/assert/Makefile.in b/libc/misc/assert/Makefile.in index 20f9c2115..3bc3ab556 100644 --- a/libc/misc/assert/Makefile.in +++ b/libc/misc/assert/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. @@ -15,6 +14,8 @@ MISC_ASSERT_SRC := $(MISC_ASSERT_DIR)/__assert.c MISC_ASSERT_OBJ := $(MISC_ASSERT_OUT)/__assert.o libc-y += $(MISC_ASSERT_OBJ) +libc-a-y += $(MISC_ASSERT_OBJ) +libc-so-y += $(MISC_ASSERT_OBJ:.o=.os) objclean-y += misc_assert_objclean diff --git a/libc/misc/assert/__assert.c b/libc/misc/assert/__assert.c index 4282812a5..bd3b3a91d 100644 --- a/libc/misc/assert/__assert.c +++ b/libc/misc/assert/__assert.c @@ -27,7 +27,6 @@ * and is useful in debugging the stdio code. */ -#define _ISOC99_SOURCE #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -35,7 +34,6 @@ libc_hidden_proto(fprintf) libc_hidden_proto(abort) -libc_hidden_proto(stderr) /* Get the prototype from assert.h as a double-check. */ #undef NDEBUG |