comparison src/lisp.h @ 4511:71bf2c5667ba ac-fix-2008-10-25

Fix g++ const char -> char warnings.
author Stephen J. Turnbull <stephen@xemacs.org>
date Sat, 25 Oct 2008 20:35:36 +0900
parents 98af8a976fc3
children 66411359ce4e
comparison
equal deleted inserted replaced
4510:bd1fbed783dd 4511:71bf2c5667ba
3797 3797
3798 /* Help debug crashes gc-marking a staticpro'ed object. */ 3798 /* Help debug crashes gc-marking a staticpro'ed object. */
3799 3799
3800 MODULE_API void staticpro_1 (Lisp_Object *, Ascbyte *); 3800 MODULE_API void staticpro_1 (Lisp_Object *, Ascbyte *);
3801 MODULE_API void staticpro_nodump_1 (Lisp_Object *, Ascbyte *); 3801 MODULE_API void staticpro_nodump_1 (Lisp_Object *, Ascbyte *);
3802 #define staticpro(ptr) staticpro_1 (ptr, #ptr) 3802 /* g++ 4.3 complains about the conversion of const char to char.
3803 #define staticpro_nodump(ptr) staticpro_nodump_1 (ptr, #ptr) 3803 These end up in a dynarray, so we would need to define a whole new class
3804 of dynarray just to handle the const char stuff.
3805 ####Check to see how hard this might be. */
3806 #define staticpro(ptr) staticpro_1 (ptr, (Ascbyte *) #ptr)
3807 #define staticpro_nodump(ptr) staticpro_nodump_1 (ptr, (Ascbyte *) #ptr)
3804 3808
3805 #ifdef HAVE_SHLIB 3809 #ifdef HAVE_SHLIB
3806 MODULE_API void unstaticpro_nodump_1 (Lisp_Object *, Ascbyte *); 3810 MODULE_API void unstaticpro_nodump_1 (Lisp_Object *, Ascbyte *);
3807 #define unstaticpro_nodump(ptr) unstaticpro_nodump_1 (ptr, #ptr) 3811 #define unstaticpro_nodump(ptr) unstaticpro_nodump_1 (ptr, (Ascbyte *) #ptr)
3808 #endif 3812 #endif
3809 3813
3810 #else 3814 #else
3811 3815
3812 /* Call staticpro (&var) to protect static variable `var'. */ 3816 /* Call staticpro (&var) to protect static variable `var'. */