Tera TermRevision: 7541
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7541
Author: zmatsuo
Date: 2019-04-01 22:50:47 +0900 (Mon, 01 Apr 2019)
Log Message:
-----------
MinGW clangでビルドが通るようにした
Modified Paths:
--------------
trunk/TTProxy/ProxyWSockHook.h
trunk/teraterm/teraterm/filesys.cpp
trunk/teraterm/teraterm/vtwin.cpp
-------------- next part --------------
Modified: trunk/TTProxy/ProxyWSockHook.h
===================================================================
--- trunk/TTProxy/ProxyWSockHook.h 2019-04-01 13:50:32 UTC (rev 7540)
+++ trunk/TTProxy/ProxyWSockHook.h 2019-04-01 13:50:47 UTC (rev 7541)
@@ -1389,9 +1389,9 @@
static const char base64_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
char buf[1024];
int status_code;
- if (sendToSocketFormat(s, strchr(realhost,':')?"CONNECT [%s]:%d HTTP/1.1\r\n":"CONNECT %s:%d HTTP/1.1\r\n", realhost, realport) == SOCKET_ERROR)
+ if (sendToSocketFormat(s, strchr((const char *)realhost,':')?"CONNECT [%s]:%d HTTP/1.1\r\n":"CONNECT %s:%d HTTP/1.1\r\n", (const char *)realhost, realport) == SOCKET_ERROR)
return SOCKET_ERROR;
- if (sendToSocketFormat(s, strchr(realhost,':')?"Host: [%s]:%d\r\n":"Host: %s:%d\r\n", realhost, realport) == SOCKET_ERROR)
+ if (sendToSocketFormat(s, strchr((const char *)realhost,':')?"Host: [%s]:%d\r\n":"Host: %s:%d\r\n", (const char *)realhost, realport) == SOCKET_ERROR)
return SOCKET_ERROR;
if (proxy.user != NULL) {
int userlen = strlen(proxy.user);
@@ -1732,15 +1732,15 @@
while (!err) {
switch (wait_for_prompt(s, prompt_table, countof(prompt_table), 10)) {
case 0: /* Hostname prompt */
- if (sendToSocketFormat(s, strchr(realhost,':')?"[%s]:%d\n":"%s:%d\n", realhost, realport) == SOCKET_ERROR)
+ if (sendToSocketFormat(s, strchr((const char *)realhost,':')?"[%s]:%d\n":"%s:%d\n", (const char *)realhost, realport) == SOCKET_ERROR)
return SOCKET_ERROR;
break;
case 1: /* Username prompt */
- if (sendToSocketFormat(s, "%s\n", proxy.user) == SOCKET_ERROR)
+ if (sendToSocketFormat(s, "%s\n", (const char *)proxy.user) == SOCKET_ERROR)
return SOCKET_ERROR;
break;
case 2: /* Password prompt */
- if (sendToSocketFormat(s, "%s\n", proxy.pass) == SOCKET_ERROR)
+ if (sendToSocketFormat(s, "%s\n", (const char *)proxy.pass) == SOCKET_ERROR)
return SOCKET_ERROR;
break;
case 3: /* Established message */
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp 2019-04-01 13:50:32 UTC (rev 7540)
+++ trunk/teraterm/teraterm/filesys.cpp 2019-04-01 13:50:47 UTC (rev 7541)
@@ -340,7 +340,7 @@
{
CloseFileSync(*fv);
//if ((*fv)->FileOpen) _lclose((*fv)->FileHandle);
- if ((*fv)->FnStrMemHandle>0)
+ if ((*fv)->FnStrMemHandle != 0)
{
GlobalUnlock((*fv)->FnStrMemHandle);
GlobalFree((*fv)->FnStrMemHandle);
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2019-04-01 13:50:32 UTC (rev 7540)
+++ trunk/teraterm/teraterm/vtwin.cpp 2019-04-01 13:50:47 UTC (rev 7541)
@@ -395,7 +395,7 @@
// (2007.9.30 yutaka)
//
// \x97\xE1\x8AO\x83R\x81[\x83h\x82\x9A\x97\xF1\x82֕ϊ\xB7\x82\xB7\x82\xE9
-static char *GetExceptionString(int exception)
+static const char *GetExceptionString(DWORD exception)
{
#define EXCEPTION(x) case EXCEPTION_##x: return (#x);
static char buf[16];