diff Wnn/jserver/rd_jishoop.c @ 1:790205f476c0

applied wnn_dec12.diff

--- a/Wnn/jserver/rd_jishoop.c	Thu Dec 13 04:30:14 2007 +0900
+++ b/Wnn/jserver/rd_jishoop.c	Thu Dec 13 04:47:24 2007 +0900
@@ -86,22 +86,22 @@
 #endif /* CONVERT_with_SiSheng */
 
   if ((jtl->bufsize_kanji <= jtl->maxkanji + (Strlen (kanji) + Strlen (comment) + Strlen (yomi) + 3) * sizeof (w_char) + 1)
-      && (ud_realloc_kanji (jtl) == NULL))
+      && (ud_realloc_kanji (jtl) == 0))
     {
       return (-1);
     }
   if (jtl->bufsize_ri1[D_YOMI] <= jtl->maxri1[D_YOMI] + 2
-     && rd_realloc_ri1 (jtl, D_YOMI) == NULL)
+     && rd_realloc_ri1 (jtl, D_YOMI) == 0)
     {
       return (-1);
     }
   if (jtl->bufsize_ri1[D_KANJI] <= jtl->maxri1[D_KANJI] + 2
-     && rd_realloc_ri1 (jtl, D_KANJI) == NULL)
+     && rd_realloc_ri1 (jtl, D_KANJI) == 0)
     {
       return (-1);
     }
   if (jtl->bufsize_serial <= jtl->maxserial + 4
-     && ud_realloc_serial (jtl) == NULL)
+     && ud_realloc_serial (jtl) == 0)
     {
       return (-1);
     }
@@ -289,7 +289,7 @@
   p = jtl->ri2 + serial;
   get_kanji_str (jtl->kanji + p->kanjipter, NULL, yomi, NULL);
 
-  jd->kanji1 = p->kanjipter;
+  jd->kanji1 = (UCHAR *)p->kanjipter;
   jd->kanji2 = 0;
   jd->serial = serial;
   jd->kosuu = 1;