diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-01-27 11:25:41 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-27 11:25:41 -0500 |
| commit | 43455e09166350b1237d2168d1b008c9f47ebaf0 (patch) | |
| tree | 42390fa1645e01c728923b9874cc61a35823cffd /malloc | |
| parent | 6ac2f2df75d3b48ab502f0b0275b7e838e90c0b1 (diff) | |
| parent | 965a54a4eecc6cf5c53718f07290171f744c4d6c (diff) | |
| download | glibc-43455e09166350b1237d2168d1b008c9f47ebaf0.tar.gz glibc-43455e09166350b1237d2168d1b008c9f47ebaf0.tar.xz glibc-43455e09166350b1237d2168d1b008c9f47ebaf0.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/obstack.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/malloc/obstack.h b/malloc/obstack.h index 4677891472..096385663c 100644 --- a/malloc/obstack.h +++ b/malloc/obstack.h @@ -1,5 +1,5 @@ /* obstack.h - object stack macros - Copyright (C) 1988-1994,1996-1999,2003,2004,2005,2009,2011 + Copyright (C) 1988-1994,1996-1999,2003,2004,2005,2009,2011,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -250,7 +250,7 @@ extern int obstack_exit_failure; #define obstack_memory_used(h) _obstack_memory_used (h) -#if defined __GNUC__ && defined __STDC__ && __STDC__ +#if defined __GNUC__ /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and does not implement __extension__. But that compiler doesn't define __GNUC_MINOR__. */ @@ -402,7 +402,7 @@ __extension__ \ __o->next_free = __o->object_base = (char *)__obj; \ else (obstack_free) (__o, __obj); }) -#else /* not __GNUC__ or not __STDC__ */ +#else /* not __GNUC__ */ # define obstack_object_size(h) \ (unsigned) ((h)->next_free - (h)->object_base) @@ -500,7 +500,7 @@ __extension__ \ = (h)->temp.tempint + (char *) (h)->chunk), 0) \ : ((obstack_free) ((h), (h)->temp.tempint + (char *) (h)->chunk), 0))) -#endif /* not __GNUC__ or not __STDC__ */ +#endif /* not __GNUC__ */ #ifdef __cplusplus } /* C++ */ |