changeset 6:56c98768f86b

imported patch 08_kinput2-v3.1-fix-gcc-warning.patch

--- a/lib/Canna.c	Mon Mar 08 20:07:06 2010 +0900
+++ b/lib/Canna.c	Mon Mar 08 20:07:06 2010 +0900
@@ -96,14 +96,17 @@
 static int PreeditString();
 static int StatusString();
 
-static initializeCannaConnection();
-static toJapaneseMode();
+static void initializeCannaConnection();
+static void toJapaneseMode();
 static void convend();
-static changeTextForCanna();
-static copyInWchar();
-static fixProcForCanna();
-static shiftRight(), shiftLeft(), shiftLeftAll();
-static ibufInitialize(), freeIBuf();
+static void changeTextForCanna();
+static int copyInWchar();
+static void fixProcForCanna();
+static void shiftRight();
+static void shiftLeft();
+static void shiftLeftAll();
+static void ibufInitialize();
+static int freeIBuf();
 
 #ifdef KC_SETLISTCALLBACK
 #ifdef CANNA_LIST_Convert
@@ -637,7 +640,7 @@
 
 static int nCannaContexts = 0;
 
-static
+static void
 initializeCannaConnection(obj)
 CannaObject obj;
 {
@@ -843,7 +846,7 @@
 
  */
 
-static
+static void
 changeTextForCanna(cldata, ksp)
 caddr_t cldata;
 wcKanjiStatus *ksp;
@@ -1061,7 +1064,7 @@
 
  */
 
-static
+static void
 fixProcForCanna(cldata, fixedstr, fixedlen)
 caddr_t cldata;
 wchar *fixedstr;
@@ -1089,7 +1092,7 @@
 
  */
 
-static
+static void
 shiftRight(ib)
 iBuf *ib;
 {
@@ -1118,7 +1121,7 @@
 
  */
 
-static
+static void
 shiftLeft(ib)
 iBuf *ib;
 {
@@ -1144,7 +1147,7 @@
 
  */
 
-static
+static void
 shiftLeftAll(ib)
 iBuf *ib;
 {
@@ -1172,7 +1175,7 @@
    ibufInitialize -- ibuf の初期化処理
  */
 
-static
+static void
 ibufInitialize(obj)
 CannaObject obj;
 {
@@ -1203,7 +1206,7 @@
 
  */
 
-static
+static int
 freeIBuf(ib)
 iBuf *ib;
 {
@@ -1229,7 +1232,7 @@
   return 0;
 }
 
-static
+static void
 toJapaneseMode(obj)
 CannaObject obj;
 {

--- a/lib/XimpProto.c	Mon Mar 08 20:07:06 2010 +0900
+++ b/lib/XimpProto.c	Mon Mar 08 20:07:06 2010 +0900
@@ -1689,10 +1689,10 @@
 
     /* data[0]-data[3]: Area.{x,y,width,height} */
     if (mask & XIMP_STS_AREA_MASK) {
-	data[0] = xsattr->areax = data[0];
-	data[1] = xsattr->areay = data[1];
-	data[2] = xsattr->areawidth = data[2];
-	data[3] = xsattr->areaheight = data[3];
+	data[0] = xsattr->areax;
+	data[1] = xsattr->areay;
+	data[2] = xsattr->areawidth;
+	data[3] = xsattr->areaheight;
     }
     /* data[4]: Foreground */
     if (mask & XIMP_STS_FG_MASK) {