diff Wnn/jserver/jishosub.c @ 27:6bfa7ea3b75b

- resolved conflict between pointer and int - more warning suppression

--- a/Wnn/jserver/jishosub.c	Sat Mar 06 07:58:49 2010 +0900
+++ b/Wnn/jserver/jishosub.c	Sat Mar 06 18:29:27 2010 +0900
@@ -139,7 +139,7 @@
   int sdiff;
   int last;
   int serialst;
-  UCHAR *kanji1;
+  int kanji1;
 
 
   yomi[0] = 0;
@@ -166,7 +166,7 @@
         case ST_NOPTER:
           tsize = *(w_char *) (hopter + 2);
           serialst = *(int *) (hopter + 4);
-          kanji1 = (UCHAR *) (hopter + 8);
+          kanji1 = *(int *) (hopter + 8);
           charst = (w_char *) (hopter + 12);
           sumst = ((w_char *) charst + tsize + 2);
           /* + 2 keeps two zero words */
@@ -187,7 +187,7 @@
               yomi[len] = charst[key];
               yomi[len + 1] = 0;
 
-              jd->kanji1 = (int)kanji1; // xxx this may result in failure --yaz
+              jd->kanji1 = kanji1;
               jd->kanji2 = serial - serialst;
               jd->serial = serial;
               jd->kosuu = 1;
@@ -353,7 +353,7 @@
   Strncpy (yomi + 4, (p->yomi) + 1, len - 4);
   yomi[len] = 0;
 
-  jd->kanji1 = p->kanjipter; // xxx this may result in failure --yaz
+  jd->kanji1 = p->kanjipter;
   jd->kanji2 = serial - p->serial;
   jd->serial = serial;
   jd->kosuu = 1;