diff options
author | Jim Meyering <jim@meyering.net> | 2002-08-31 16:52:18 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2002-08-31 16:52:18 +0000 |
commit | 5bdb1226ebefd92e295e5cd47d0484b6f890dbea (patch) | |
tree | 8f2b755c93e0e0ce9b7e7fbfb65dd5f2010e140d | |
parent | eb540d8e9ba3059d49ed05b45ad456337f73a514 (diff) | |
download | coreutils-5bdb1226ebefd92e295e5cd47d0484b6f890dbea.tar.xz |
Update from GNU libc.
-rw-r--r-- | lib/obstack.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/obstack.c b/lib/obstack.c index 0244da383..8dd118b0d 100644 --- a/lib/obstack.c +++ b/lib/obstack.c @@ -1,5 +1,5 @@ /* obstack.c - subroutines used implicitly by object stack macros - Copyright (C) 1988-1994,96,97,98,99,2000,2001 Free Software Foundation, Inc. + Copyright (C) 1988-1994, 1996-2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Its master source is NOT part of the C library, however. The master source lives in /gd/gnu/lib. @@ -22,7 +22,11 @@ # include <config.h> #endif -#include "obstack.h" +#ifdef _LIBC +# include <obstack.h> +#else +# include "obstack.h" +#endif /* NOTE BEFORE MODIFYING THIS FILE: This version number must be incremented whenever callers compiled using an old obstack.h can no @@ -338,6 +342,9 @@ _obstack_newchunk (h, length) /* The new chunk certainly contains no empty object yet. */ h->maybe_empty_object = 0; } +# ifdef _LIBC +libc_hidden_def (_obstack_newchunk) +# endif /* Return nonzero if object OBJ has been allocated from obstack H. This is here for debugging. @@ -468,9 +475,8 @@ _obstack_memory_used (h) # define _(Str) (Str) # endif # endif -# if defined _LIBC && defined USE_IN_LIBIO +# ifdef _LIBC # include <libio/iolibio.h> -# define fputs(s, f) _IO_fputs (s, f) # endif # ifndef __attribute__ |