merge from gcc

2004-07-13 21:10:23 +00:00
parent 650bcf9d74
commit e84b534998
3 changed files with 17 additions and 4 deletions
--- a/include/obstack.h
+++ b/include/obstack.h
@ -494,9 +494,9 @@ __extension__								\
 # define obstack_free(OBSTACK, OBJ)					\
 __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
-   void *__obj = (OBJ);							\
+   void *__obj = (void *) (OBJ);					\
   if (__obj > (void *)__o->chunk && __obj < (void *)__o->chunk_limit)  \
-     __o->next_free = __o->object_base = __obj;				\
+     __o->next_free = __o->object_base = (char *) __obj;		\
   else (obstack_free) (__o, __obj); })

 #else /* not __GNUC__ or not __STDC__ */