diff options
Diffstat (limited to 'include/obstack.h')
-rw-r--r-- | include/obstack.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/include/obstack.h b/include/obstack.h index a20ab5596..38e967776 100644 --- a/include/obstack.h +++ b/include/obstack.h @@ -143,16 +143,12 @@ extern "C" { #if defined _LIBC || defined HAVE_STRING_H # include <string.h> -# if defined __STDC__ && __STDC__ -# define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N)) -# else -# define _obstack_memcpy(To, From, N) memcpy ((To), (char *)(From), (N)) -# endif +# define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N)) #else # ifdef memcpy -# define _obstack_memcpy(To, From, N) memcpy ((To), (char *)(From), (N)) +# define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N)) # else -# define _obstack_memcpy(To, From, N) bcopy ((char *)(From), (To), (N)) +# define _obstack_memcpy(To, From, N) bcopy ((From), (To), (N)) # endif #endif @@ -389,7 +385,7 @@ __extension__ \ int __len = (length); \ if (__o->next_free + __len > __o->chunk_limit) \ _obstack_newchunk (__o, __len); \ - _obstack_memcpy (__o->next_free, (where), __len); \ + _obstack_memcpy (__o->next_free, (char *) (where), __len); \ __o->next_free += __len; \ (void) 0; }) @@ -399,7 +395,7 @@ __extension__ \ int __len = (length); \ if (__o->next_free + __len + 1 > __o->chunk_limit) \ _obstack_newchunk (__o, __len + 1); \ - _obstack_memcpy (__o->next_free, (where), __len); \ + _obstack_memcpy (__o->next_free, (char *) (where), __len); \ __o->next_free += __len; \ *(__o->next_free)++ = 0; \ (void) 0; }) @@ -514,14 +510,14 @@ __extension__ \ ( (h)->temp = (length), \ (((h)->next_free + (h)->temp > (h)->chunk_limit) \ ? (_obstack_newchunk ((h), (h)->temp), 0) : 0), \ - _obstack_memcpy ((h)->next_free, (where), (h)->temp), \ + _obstack_memcpy ((h)->next_free, (char *) (where), (h)->temp), \ (h)->next_free += (h)->temp) # define obstack_grow0(h,where,length) \ ( (h)->temp = (length), \ (((h)->next_free + (h)->temp + 1 > (h)->chunk_limit) \ ? (_obstack_newchunk ((h), (h)->temp + 1), 0) : 0), \ - _obstack_memcpy ((h)->next_free, (where), (h)->temp), \ + _obstack_memcpy ((h)->next_free, (char *) (where), (h)->temp), \ (h)->next_free += (h)->temp, \ *((h)->next_free)++ = 0) |