Mercurial > hg > xemacs-beta
comparison 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 |
comparison
equal
deleted
inserted
replaced
4509:dd12adb12b8f | 4512:66411359ce4e |
---|---|
3813 | 3813 |
3814 /* Help debug crashes gc-marking a staticpro'ed object. */ | 3814 /* Help debug crashes gc-marking a staticpro'ed object. */ |
3815 | 3815 |
3816 MODULE_API void staticpro_1 (Lisp_Object *, Ascbyte *); | 3816 MODULE_API void staticpro_1 (Lisp_Object *, Ascbyte *); |
3817 MODULE_API void staticpro_nodump_1 (Lisp_Object *, Ascbyte *); | 3817 MODULE_API void staticpro_nodump_1 (Lisp_Object *, Ascbyte *); |
3818 #define staticpro(ptr) staticpro_1 (ptr, #ptr) | 3818 /* g++ 4.3 complains about the conversion of const char to char. |
3819 #define staticpro_nodump(ptr) staticpro_nodump_1 (ptr, #ptr) | 3819 These end up in a dynarray, so we would need to define a whole new class |
3820 of dynarray just to handle the const char stuff. | |
3821 ####Check to see how hard this might be. */ | |
3822 #define staticpro(ptr) staticpro_1 (ptr, (Ascbyte *) #ptr) | |
3823 #define staticpro_nodump(ptr) staticpro_nodump_1 (ptr, (Ascbyte *) #ptr) | |
3820 | 3824 |
3821 #ifdef HAVE_SHLIB | 3825 #ifdef HAVE_SHLIB |
3822 MODULE_API void unstaticpro_nodump_1 (Lisp_Object *, Ascbyte *); | 3826 MODULE_API void unstaticpro_nodump_1 (Lisp_Object *, Ascbyte *); |
3823 #define unstaticpro_nodump(ptr) unstaticpro_nodump_1 (ptr, #ptr) | 3827 #define unstaticpro_nodump(ptr) unstaticpro_nodump_1 (ptr, (Ascbyte *) #ptr) |
3824 #endif | 3828 #endif |
3825 | 3829 |
3826 #else | 3830 #else |
3827 | 3831 |
3828 /* Call staticpro (&var) to protect static variable `var'. */ | 3832 /* Call staticpro (&var) to protect static variable `var'. */ |