# HG changeset patch
# User Yoshiki Yazawa <yaz@honeyplanet.jp>
# Date 1268048296 -32400
# Node ID 1f1719e33c6281961df4518f01363a0a319d470b
# Parent  983aff0dcf18afaba85e7cd8b0021e47b4311e27
imported patch 15_kinput2-v3.1-canna37.diff

diff -r 983aff0dcf18 -r 1f1719e33c62 lib/Canna.c
--- a/lib/Canna.c	Mon Mar 08 20:37:40 2010 +0900
+++ b/lib/Canna.c	Mon Mar 08 20:38:16 2010 +0900
@@ -61,6 +61,10 @@
 #include "CannaP.h"
 #include "DebugPrint.h"
 
+/* Canna 3.7以降はこのように定義する */
+#define CANNA_WCHAR16
+#define CANNA_NEW_WCHAR_AWARE
+/* Canna 3.6までの場合 */
 #define _WCHAR_T /* この定義は jrkanji.h で wcKanjiStatus などを定義するため */
 #define wchar_t wchar
 
@@ -271,7 +275,7 @@
 
     /* かな漢字変換する */
     len = wcKanjiString((int)obj, (int)buf[0],
-			(wchar_t *)buf, 1024, &kanji_status);
+			(wchar *)buf, 1024, &kanji_status);
 
     displayPreEdit(obj, len, buf, &kanji_status);
     return (kanji_status.info & KanjiThroughInfo) ? 1 : 0;
@@ -642,7 +646,9 @@
 CannaObject obj;
 {
   char **warn = 0;
+#ifndef CANNA_JR_BEEP_FUNC_DECLARED
   extern (*jrBeepFunc)();
+#endif
 
   if (nCannaContexts == 0) {
 #ifdef KC_SETSERVERNAME