APPROVE COMMIT 21.5
In principle I'm not sure about this (see similar patch to src which I
am not committing yet), but Canna is (a) not terribly much used and
(b) incredibly grody code. I mean, casting a Boolean to (char *)?
Yeeech.
Index: modules/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ChangeLog,v
retrieving revision 1.63
diff -u -r1.63 ChangeLog
--- modules/ChangeLog 22 Jun 2007 16:58:36 -0000 1.63
+++ modules/ChangeLog 29 Jun 2007 07:44:00 -0000
@@ -0,0 +1,6 @@
+2007-06-23 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * canna/canna_api.c (Fcanna_set_bunsetsu):
+ (Fcanna_initialize):
+ Suppress warnings about loss of precision on amd64.
+
Index: modules/canna/canna_api.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/canna/canna_api.c,v
retrieving revision 1.4
diff -u -r1.4 canna_api.c
--- modules/canna/canna_api.c 15 Feb 2007 16:12:19 -0000 1.4
+++ modules/canna/canna_api.c 29 Jun 2007 07:44:00 -0000
@@ -333,11 +333,12 @@
*/
(num))
{
- int kugiri; /* ʸÀá¶èÀÚ¤ê¤ò¤¹¤ë¤«¡© (display clause separator?) */
+ /* This is actually a Boolean! */
+ char *kugiri; /* ʸÀá¶èÀÚ¤ê¤ò¤¹¤ë¤«¡© (display clause separator?) */
- kugiri = NILP (num) ? 0 : 1;
+ kugiri = NILP (num) ? (char *) 0 : (char *) 1;
- jrKanjiControl (0, KC_SETBUNSETSUKUGIRI, (char *) kugiri);
+ jrKanjiControl (0, KC_SETBUNSETSUKUGIRI, kugiri);
return Qnil;
}
@@ -365,19 +366,19 @@
int res;
char **p, **q;
- int kugiri; /* ʸÀá¶èÀÚ¤ê¤ò¤¹¤ë¤«¡© (display clause separator?) */
+ /* This is actually a Boolean! */
+ char *kugiri; /* ʸÀá¶èÀÚ¤ê¤ò¤¹¤ë¤«¡© (display clause separator?) */
IRCP_context = -1;
if (NILP (num))
{
- kugiri = 1;
+ kugiri = (char *) 1;
}
else
{
CHECK_INT (num);
- kugiri = XINT (num);
- kugiri = (kugiri == 1) ? 1 : 0;
+ kugiri = (XINT (num) == 1) ? (char *) 1 : (char *) 0;
}
if (NILP (server))
@@ -444,7 +445,7 @@
#endif /* CANNA_MULE */
#endif /* KC_SETAPPNAME */
- jrKanjiControl (0, KC_SETBUNSETSUKUGIRI, (char *) kugiri);
+ jrKanjiControl (0, KC_SETBUNSETSUKUGIRI, kugiri);
jrKanjiControl (0, KC_SETWIDTH, (char *) 78);
#ifndef CANNA_MULE
jrKanjiControl (0, KC_INHIBITHANKAKUKANA, (char *) 1);
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches