Tera TermRevision: 8260
https://osdn.net/projects/ttssh2/scm/svn/commits/8260
Author: yutakapon
Date: 2019-10-06 12:30:46 +0900 (Sun, 06 Oct 2019)
Log Message:
-----------
trunkからリビジョン8259をマージ:
コンパイル時の警告を修正
- r8240 の変更がきっかけ
- UTIL_get_lang_msg() の引数に const を追加
........
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/8240
Modified Paths:
--------------
branches/openssl_1_1_1_v3/ttssh2/ttxssh/util.c
branches/openssl_1_1_1_v3/ttssh2/ttxssh/util.h
Property Changed:
----------------
branches/openssl_1_1_1_v3/
-------------- next part --------------
Index: branches/openssl_1_1_1_v3
===================================================================
--- branches/openssl_1_1_1_v3 2019-10-05 13:51:32 UTC (rev 8259)
+++ branches/openssl_1_1_1_v3 2019-10-06 03:30:46 UTC (rev 8260)
Property changes on: branches/openssl_1_1_1_v3
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,5 ##
/branches/ttproxy_improved:8041,8055-8056
/branches/ttssh_improved:8027,8036,8040,8044,8053-8054,8058,8060,8063,8081,8085
/branches/vs2015_warn:6194-6285
-/tags/teraterm-4_89:6182
\ No newline at end of property
+/tags/teraterm-4_89:6182
+/trunk:8259
\ No newline at end of property
Modified: branches/openssl_1_1_1_v3/ttssh2/ttxssh/util.c
===================================================================
--- branches/openssl_1_1_1_v3/ttssh2/ttxssh/util.c 2019-10-05 13:51:32 UTC (rev 8259)
+++ branches/openssl_1_1_1_v3/ttssh2/ttxssh/util.c 2019-10-06 03:30:46 UTC (rev 8260)
@@ -314,7 +314,7 @@
return buf->buflen / 2 < buf->datalen;
}
-void UTIL_get_lang_msg(PCHAR key, PTInstVar pvar, PCHAR def)
+void UTIL_get_lang_msg(const char *key, PTInstVar pvar, const char *def)
{
GetI18nStr("TTSSH", key, pvar->ts->UIMsg, sizeof(pvar->ts->UIMsg),
def, pvar->ts->UILanguageFile);
Modified: branches/openssl_1_1_1_v3/ttssh2/ttxssh/util.h
===================================================================
--- branches/openssl_1_1_1_v3/ttssh2/ttxssh/util.h 2019-10-05 13:51:32 UTC (rev 8259)
+++ branches/openssl_1_1_1_v3/ttssh2/ttxssh/util.h 2019-10-06 03:30:46 UTC (rev 8260)
@@ -84,7 +84,7 @@
void UTIL_destroy_sock_write_buf(UTILSockWriteBuf *buf);
BOOL UTIL_is_sock_deeply_buffered(UTILSockWriteBuf *buf);
-void UTIL_get_lang_msg(PCHAR key, PTInstVar pvar, PCHAR def);
+void UTIL_get_lang_msg(const char *key, PTInstVar pvar, const char *def);
HFONT UTIL_get_lang_fixedfont(HWND hWnd, const char *UILanguageFile);
#endif