Mercurial > hg > xemacs-beta
changeset 1792:6fcd90c626a7
[xemacs-hg @ 2003-11-14 22:59:23 by james]
ICC also understands typeof.
| author | james |
|---|---|
| date | Fri, 14 Nov 2003 22:59:28 +0000 |
| parents | a00997930c42 |
| children | dffccbe09be1 |
| files | src/ChangeLog src/emacs.c src/ralloc.c |
| diffstat | 3 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Nov 14 22:50:44 2003 +0000 +++ b/src/ChangeLog Fri Nov 14 22:59:28 2003 +0000 @@ -1,3 +1,10 @@ +2003-11-14 Jerry James <james@xemacs.org> + + * emacs.c (voodoo_free_hook): ICC understands typeof. + * emacs.c (Fkill_emacs): Ditto. + * ralloc.c (init_ralloc): Ditto. + * ralloc.c (r_alloc_reinit): Ditto. + 2003-11-14 Jerry James <james@xemacs.org> * config.h.in: Remove last traces of GNU DLD.
--- a/src/emacs.c Fri Nov 14 22:50:44 2003 +0000 +++ b/src/emacs.c Fri Nov 14 22:59:28 2003 +0000 @@ -3338,7 +3338,8 @@ /* Disable all calls to free() when XEmacs is exiting and it doesn't */ /* matter. */ __free_hook = -#ifdef __GNUC__ /* prototype of __free_hook varies with glibc version */ +#if defined (__GNUC__) || defined (__ICC) + /* prototype of __free_hook varies with glibc version */ (__typeof__ (__free_hook)) #endif voodoo_free_hook; @@ -3403,7 +3404,8 @@ #if defined (GNU_MALLOC) __free_hook = -#ifdef __GNUC__ /* prototype of __free_hook varies with glibc version */ +#if defined (__GNUC__) || defined (__ICC) + /* prototype of __free_hook varies with glibc version */ (__typeof__ (__free_hook)) #endif voodoo_free_hook;
--- a/src/ralloc.c Fri Nov 14 22:50:44 2003 +0000 +++ b/src/ralloc.c Fri Nov 14 22:59:28 2003 +0000 @@ -1127,7 +1127,7 @@ r_alloc_initialized = 1; real_morecore = (POINTER (*) (ptrdiff_t)) __morecore; __morecore = -#ifdef __GNUC__ +#if defined (__GNUC__) || defined (__ICC) (__typeof__ (__morecore)) #endif r_alloc_sbrk; @@ -1185,7 +1185,7 @@ { real_morecore = (POINTER (*) (ptrdiff_t)) __morecore; __morecore = -#ifdef __GNUC__ +#if defined (__GNUC__) || defined (__ICC) (__typeof__ (__morecore)) #endif r_alloc_sbrk;