diff options
| author | DJ Delorie <dj@redhat.com> | 2005-05-24 21:00:54 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2005-05-24 21:00:54 +0000 |
| commit | 53726a558de47d598f159fbd8862a293b92846ed (patch) | |
| tree | a035afde33242787c9a81e2ba3fb0900d87cc2fa | |
| parent | bffa834f8ea5d257e8f71d85f5832d2d313d09e4 (diff) | |
| download | cygnal-53726a558de47d598f159fbd8862a293b92846ed.tar.gz cygnal-53726a558de47d598f159fbd8862a293b92846ed.tar.bz2 cygnal-53726a558de47d598f159fbd8862a293b92846ed.zip | |
merge from gcc
| -rw-r--r-- | include/ChangeLog | 7 | ||||
| -rw-r--r-- | include/ansidecl.h | 4 | ||||
| -rw-r--r-- | include/libiberty.h | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index f7097c968..62a5eae34 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,10 @@ +2005-05-24 Gabriel Dos Reis <gdr@integrable-solutions.net> + + * libiberty.h (ACONCAT): Properly cast value of alloca(). + + * ansidecl.h (ATTRIBUTE_UNUSED_LABEL): Don't define if + __cplusplus. + 2005-05-12 Steve Ellcey <sje@cup.hp.com> libiberty.h: Do not define empty basename prototype. diff --git a/include/ansidecl.h b/include/ansidecl.h index 02bb41240..380e7b351 100644 --- a/include/ansidecl.h +++ b/include/ansidecl.h @@ -258,11 +258,11 @@ So instead we use the macro below and test it against specific values. */ /* Attributes on labels were valid as of gcc 2.93. */ #ifndef ATTRIBUTE_UNUSED_LABEL -# if (GCC_VERSION >= 2093) +# if (!defined (__cplusplus) && GCC_VERSION >= 2093) # define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED # else # define ATTRIBUTE_UNUSED_LABEL -# endif /* GNUC >= 2.93 */ +# endif /* !__cplusplus && GNUC >= 2.93 */ #endif /* ATTRIBUTE_UNUSED_LABEL */ #ifndef ATTRIBUTE_UNUSED diff --git a/include/libiberty.h b/include/libiberty.h index ae0ab2bde..9af981cd7 100644 --- a/include/libiberty.h +++ b/include/libiberty.h @@ -156,7 +156,7 @@ extern char *libiberty_concat_ptr; strings. Allocates memory using alloca. The arguments are evaluated twice! */ #define ACONCAT(ACONCAT_PARAMS) \ - (libiberty_concat_ptr = alloca (concat_length ACONCAT_PARAMS + 1), \ + (libiberty_concat_ptr = (char *) alloca (concat_length ACONCAT_PARAMS + 1), \ concat_copy2 ACONCAT_PARAMS) /* Check whether two file descriptors refer to the same file. */ |