diff options
| author | DJ Delorie <dj@redhat.com> | 2004-07-14 01:10:23 +0400 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2004-07-14 01:10:23 +0400 |
| commit | e84b534998a19f38639d15ff62fa73265b2cb42f (patch) | |
| tree | 3f46b35e268bd632ee10c3c907ab61b64e34d973 /include | |
| parent | 650bcf9d7482a9c3604877e033a2a6b5b76a07c6 (diff) | |
merge from gcc
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 13 | ||||
| -rw-r--r-- | include/libiberty.h | 4 | ||||
| -rw-r--r-- | include/obstack.h | 4 |
3 files changed, 17 insertions, 4 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index fd340f056..e6af921b5 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,16 @@ +2004-07-13 Bernardo Innocenti <bernie@develer.com> + + * libiberty.h (XNEW, XCNEW, XNEWVEC, XCNEWVEC, XOBNEW): Move here from + libcpp/internal.h. + (XDELETE, XRESIZEVEC, XDELETEVEC, XNEWVAR, XCNEWVAR, XRESIZEVAR): New + macros. + +2004-07-13 Bernardo Innocenti <bernie@develer.com> + + * libiberty.h (ASTRDUP): Add casts required for stricter + type conversion rules of C++. + * obstack.h (obstack_free): Likewise. + 2004-07-07 Tomer Levi <Tomer.Levi@nsc.com> * dis-asm.h (print_insn_crx): Declare. diff --git a/include/libiberty.h b/include/libiberty.h index 761b2cf06..5c1015385 100644 --- a/include/libiberty.h +++ b/include/libiberty.h @@ -309,7 +309,7 @@ extern PTR C_alloca PARAMS ((size_t)) ATTRIBUTE_MALLOC; # define ASTRDUP(X) \ (__extension__ ({ const char *const libiberty_optr = (X); \ const unsigned long libiberty_len = strlen (libiberty_optr) + 1; \ - char *const libiberty_nptr = alloca (libiberty_len); \ + char *const libiberty_nptr = (char *const) alloca (libiberty_len); \ (char *) memcpy (libiberty_nptr, libiberty_optr, libiberty_len); })) #else # define alloca(x) C_alloca(x) @@ -323,7 +323,7 @@ extern unsigned long libiberty_len; # define ASTRDUP(X) \ (libiberty_optr = (X), \ libiberty_len = strlen (libiberty_optr) + 1, \ - libiberty_nptr = alloca (libiberty_len), \ + libiberty_nptr = (char *) alloca (libiberty_len), \ (char *) memcpy (libiberty_nptr, libiberty_optr, libiberty_len)) #endif diff --git a/include/obstack.h b/include/obstack.h index 5496ff240..007853e80 100644 --- 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__ */ |