changeset: 4546:71bf2c5667ba4dfece70c13c5f9fd249474f3652
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Sat Oct 25 20:35:36 2008 +0900
files: src/lisp.h
description:
Fix g++ const char -> char warnings.
diff -r bd1fbed783dd4440c1eec52e61492f4253c32c50 -r
71bf2c5667ba4dfece70c13c5f9fd249474f3652 src/lisp.h
--- a/src/lisp.h Sat Oct 25 18:59:03 2008 +0900
+++ b/src/lisp.h Sat Oct 25 20:35:36 2008 +0900
@@ -3799,12 +3799,16 @@ extern Lisp_Object_ptr_dynarr *staticpro
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
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches