[Ttssh2-commit] [7491] マージミス

scmno****@osdn***** scmno****@osdn*****
2019年 3月 18日 (月) 22:57:04 JST


Revision: 7491
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7491
Author:   zmatsuo
Date:     2019-03-18 22:57:04 +0900 (Mon, 18 Mar 2019)
Log Message:
-----------
マージミス

Modified Paths:
--------------
    branches/cmake/teraterm/teraterm/vtterm.c

-------------- next part --------------
Modified: branches/cmake/teraterm/teraterm/vtterm.c
===================================================================
--- branches/cmake/teraterm/teraterm/vtterm.c	2019-03-18 13:28:00 UTC (rev 7490)
+++ branches/cmake/teraterm/teraterm/vtterm.c	2019-03-18 13:57:04 UTC (rev 7491)
@@ -53,8 +53,6 @@
 #include "ttime.h"
 #include "clipboar.h"
 #include "codeconv.h"
-#include "codeconv.h"
-#include "codeconv.h"
 
 #include "vtterm.h"
 
@@ -5521,11 +5519,12 @@
 // \x8F]\x97\x88\x94\xC5
 static void UnicodeToCP932(unsigned int code)
 {
-	int ret;
+	size_t mblen;
 	char mbchar[2];
 
 	// Unicode\x82\xA9\x82\xE7DEC\x93\xC1\x8Eꕶ\x8E\x9A\x82ւ̃}\x83b\x83s\x83\x93\x83O
 	if (ts.UnicodeDecSpMapping) {
+		unsigned short cset;
 		cset = UTF32ToDecSp(code);
 		if (((cset >> 8) & ts.UnicodeDecSpMapping) != 0) {
 			PutDecSp(cset & 0xff);


Ttssh2-commit メーリングリストの案内