Avoid cast in non-gcc obstack_free

diff --git a/ChangeLog b/ChangeLog
index 26b89a2..7f9208f 100644 (file)
--- 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 f517a3e..8e22f43 100644 (file)
--- 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 449070e..4677891 100644 (file)
--- 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__ */