svnno****@sourc*****
svnno****@sourc*****
2016年 1月 3日 (日) 19:37:35 JST
Tera TermRevision: 6239
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6239
Author: yutakapon
Date: 2016-01-03 19:37:35 +0900 (Sun, 03 Jan 2016)
Log Message:
-----------
チケット #35744 VS2015の警告除去
ソケット関数の警告を抑止した。
Ticket Links:
------------
http://sourceforge.jp/projects/ttssh2/tracker/detail/35744
Modified Paths:
--------------
branches/vs2015_warn/teraterm/common/teraterm.h
branches/vs2015_warn/ttssh2/ttxssh/ttxssh.h
-------------- next part --------------
Modified: branches/vs2015_warn/teraterm/common/teraterm.h
===================================================================
--- branches/vs2015_warn/teraterm/common/teraterm.h 2016-01-03 10:14:06 UTC (rev 6238)
+++ branches/vs2015_warn/teraterm/common/teraterm.h 2016-01-03 10:37:35 UTC (rev 6239)
@@ -26,7 +26,9 @@
* \x82ł\xAB\x82Ȃ\xAD\x82Ȃ邽\x82߁A\x8Cx\x8D\x90\x82\xF0\x97}\x8E~\x82\xB7\x82邾\x82\xAF\x82Ƃ\xB7\x82\xE9\x81B
*/
#if _MSC_VER >= 1800 // VSC2013(VC12.0) or later
- #define _WINSOCK_DEPRECATED_NO_WARNINGS
+ #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
+ #define _WINSOCK_DEPRECATED_NO_WARNINGS
+ #endif
#endif
// AKASI\x8E\x81\x82ɂ\xE6\x82\xE9Eterm\x95\x97\x93\xA7\x89߃E\x83B\x83\x93\x83h\x83E
Modified: branches/vs2015_warn/ttssh2/ttxssh/ttxssh.h
===================================================================
--- branches/vs2015_warn/ttssh2/ttxssh/ttxssh.h 2016-01-03 10:14:06 UTC (rev 6238)
+++ branches/vs2015_warn/ttssh2/ttxssh/ttxssh.h 2016-01-03 10:37:35 UTC (rev 6239)
@@ -36,6 +36,16 @@
#pragma warning(3 : 4035)
+/* VS2015(VC14.0)\x82\xBE\x82ƁAWSASocketA(), inet_ntoa() \x82Ȃǂ\xCCAPI\x82\xAAdeprecated\x82ł\xA0\x82\xE9\x82\xC6
+* \x8Cx\x8D\x90\x82\xB7\x82邽\x82߂ɁA\x8Cx\x8D\x90\x82\xF0\x97}\x8E~\x82\xB7\x82\xE9\x81B\x91\xE3\x91֊\x94\x82ɒu\x8A\xB7\x82\xB7\x82\xE9\x82ƁAVS2005(VC8.0)\x82Ńr\x83\x8B\x83h
+* \x82ł\xAB\x82Ȃ\xAD\x82Ȃ邽\x82߁A\x8Cx\x8D\x90\x82\xF0\x97}\x8E~\x82\xB7\x82邾\x82\xAF\x82Ƃ\xB7\x82\xE9\x81B
+*/
+#if _MSC_VER >= 1800 // VSC2013(VC12.0) or later
+ #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
+ #define _WINSOCK_DEPRECATED_NO_WARNINGS
+ #endif
+#endif
+
#ifndef NO_INET6
#include <winsock2.h>
#include <ws2tcpip.h>