CVS update by stephent xemacs/modules/canna ...

[xemacs-cvs at xemacs.org]

  User: stephent
  Date: 07/06/29 10:01:09

  Modified:    xemacs/modules/canna canna_api.c
Log:
Quiet gcc warnings on amd64 (1/2). <87wsxn18ri.fsf at uwakimon.sk.tsukuba.ac.jp>

Revision  Changes    Path
1.64      +6 -0      XEmacs/xemacs/modules/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- ChangeLog	2007/06/22 16:58:36	1.63
+++ ChangeLog	2007/06/29 08:00:58	1.64
@@ -1,5 +1,11 @@
 2007-06-23  Stephen J. Turnbull  <stephen at xemacs.org>
 
+	* canna/canna_api.c (Fcanna_set_bunsetsu):
+	(Fcanna_initialize):
+	Suppress warnings about loss of precision on amd64.
+
+2007-06-23  Stephen J. Turnbull  <stephen at xemacs.org>
+
 	* ldap/eldap.h: Declare that we use deprecated API.
 	Thanks to Mats Lidell <matsl at xemacs.org> for the report & patch:
 	<871wgnqunm.fsf at spencer.lidell.homelinux.net>.



1.5       +9 -8      XEmacs/xemacs/modules/canna/canna_api.c

Index: canna_api.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/canna/canna_api.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- canna_api.c	2007/02/15 16:12:19	1.4
+++ canna_api.c	2007/06/29 08:01:08	1.5
@@ -333,11 +333,12 @@ No separator will be used otherwise.
 */
        (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 @@ If nil is specified for each arg, the de
   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 @@ If nil is specified for each arg, the de
 #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);