diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-09-11 13:04:17 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-11 13:04:17 -0400 |
| commit | 633f745dcad9c7324f56f8ef85ee9b460b1006e7 (patch) | |
| tree | 13ae225b8047e84f734d2991e0d52941f6738529 | |
| parent | f318beb8000dfcc4d8bb9f7293dc0d3e1ecdef8e (diff) | |
| download | glibc-633f745dcad9c7324f56f8ef85ee9b460b1006e7.tar.gz glibc-633f745dcad9c7324f56f8ef85ee9b460b1006e7.tar.xz glibc-633f745dcad9c7324f56f8ef85ee9b460b1006e7.zip | |
Avoid cast in non-gcc obstack_free
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | malloc/obstack.h | 8 |
3 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 26b89a2487..7f9208ffc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-09-11 Ulrich Drepper <drepper@gmail.com> + [BZ #13067] + * malloc/obstack.h [!GNUC] (obstack_free): Avoid cast to int. + [BZ #13090] * configure.in: Fix use of AC_INIT. diff --git a/NEWS b/NEWS index f517a3e9ff..8e22f43c2d 100644 --- a/NEWS +++ b/NEWS @@ -10,8 +10,8 @@ Version 2.15 * The following bugs are resolved with this release: 9696, 11589, 12403, 12847, 12868, 12852, 12874, 12885, 12907, 12922, - 12935, 13007, 13021, 13068, 13090, 13092, 13114, 13118, 13123, 13134, - 13138, 13150 + 12935, 13007, 13021, 13067, 13068, 13090, 13092, 13114, 13118, 13123, + 13134, 13138, 13150 * New program pldd to list loaded object of a process Implemented by Ulrich Drepper. diff --git a/malloc/obstack.h b/malloc/obstack.h index 449070e7f1..4677891472 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 + Copyright (C) 1988-1994,1996-1999,2003,2004,2005,2009,2011 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -496,9 +496,9 @@ __extension__ \ ( (h)->temp.tempint = (char *) (obj) - (char *) (h)->chunk, \ ((((h)->temp.tempint > 0 \ && (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk)) \ - ? (int) ((h)->next_free = (h)->object_base \ - = (h)->temp.tempint + (char *) (h)->chunk) \ - : (((obstack_free) ((h), (h)->temp.tempint + (char *) (h)->chunk), 0), 0))) + ? (((h)->next_free = (h)->object_base \ + = (h)->temp.tempint + (char *) (h)->chunk), 0) \ + : ((obstack_free) ((h), (h)->temp.tempint + (char *) (h)->chunk), 0))) #endif /* not __GNUC__ or not __STDC__ */ |