Mercurial > hg > xemacs-beta
diff src/lisp.h @ 4512:66411359ce4e
Merge in ac-fix-2008-10-25. Fix up ChangeLogs.
author | Stephen J. Turnbull <stephen@xemacs.org> |
---|---|
date | Sat, 25 Oct 2008 21:40:46 +0900 |
parents | d402d7b18bd8 71bf2c5667ba |
children | 8f1ee2d15784 |
line wrap: on
line diff
--- a/src/lisp.h Sat Oct 04 13:57:55 2008 +0900 +++ b/src/lisp.h Sat Oct 25 21:40:46 2008 +0900 @@ -3815,12 +3815,16 @@ MODULE_API void staticpro_1 (Lisp_Object *, Ascbyte *); MODULE_API void staticpro_nodump_1 (Lisp_Object *, Ascbyte *); -#define staticpro(ptr) staticpro_1 (ptr, #ptr) -#define staticpro_nodump(ptr) staticpro_nodump_1 (ptr, #ptr) +/* g++ 4.3 complains about the conversion of const char to char. + These end up in a dynarray, so we would need to define a whole new class + of dynarray just to handle the const char stuff. + ####Check to see how hard this might be. */ +#define staticpro(ptr) staticpro_1 (ptr, (Ascbyte *) #ptr) +#define staticpro_nodump(ptr) staticpro_nodump_1 (ptr, (Ascbyte *) #ptr) #ifdef HAVE_SHLIB MODULE_API void unstaticpro_nodump_1 (Lisp_Object *, Ascbyte *); -#define unstaticpro_nodump(ptr) unstaticpro_nodump_1 (ptr, #ptr) +#define unstaticpro_nodump(ptr) unstaticpro_nodump_1 (ptr, (Ascbyte *) #ptr) #endif #else