Mercurial > hg > octave-lyh > gnulib-hg
changeset 4432:2fdacf8fdb47
(__INT_TO_PTR): Revert change of 2003-03-13; it breaks C++ compilation.
[!__GNUC__ || !__STDC__] (obstack_finish): Cast result to void*.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Fri, 11 Jul 2003 23:33:34 +0000 |
parents | 063c999088d3 |
children | 79f8a2afb5f3 |
files | lib/obstack.h |
diffstat | 1 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/obstack.h +++ b/lib/obstack.h @@ -122,12 +122,8 @@ #endif #ifndef __INT_TO_PTR -#if defined __STDC__ && __STDC__ -# define __INT_TO_PTR(P) ((void *) ((P) + (char *) 0)) -#else # define __INT_TO_PTR(P) ((P) + (char *) 0) #endif -#endif /* We need the type of the resulting object. If __PTRDIFF_TYPE__ is defined, as with GNU C, use that; that way we don't pollute the @@ -585,7 +581,7 @@ > (h)->chunk_limit - (char *) (h)->chunk) \ ? ((h)->next_free = (h)->chunk_limit) : 0), \ (h)->object_base = (h)->next_free, \ - __INT_TO_PTR ((h)->temp)) + (void *) __INT_TO_PTR ((h)->temp)) # if defined __STDC__ && __STDC__ # define obstack_free(h,obj) \