• R/O
  • SSH
  • HTTPS

ttssh2: コミット


コミットメタ情報

リビジョン9227 (tree)
日時2021-04-28 01:10:55
作者zmatsuo

ログメッセージ

gcc で警告が出ないよう修正

- GetProcAddress() から変数の代入時

- warning: cast between incompatible function types from 'FARPROC' {aka 'long long int (*)()'} to 'BOOL (*)(WORD, TTXExports *)' {aka 'int (*)(short unsigned int, TTXExports *)'}

- winsock2.h を最初にinclude

- warning: #warning Please include winsock2.h before windows.h [-Wcpp]

変更サマリ

差分

--- trunk/teraterm/teraterm/ttplug.c (revision 9226)
+++ trunk/teraterm/teraterm/ttplug.c (revision 9227)
@@ -27,6 +27,7 @@
2727 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
2828 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929 */
30+#include <winsock2.h>
3031 #include "teraterm.h"
3132 #include "tttypes.h"
3233 #include "ttlib.h"
@@ -68,15 +69,16 @@
6869 hPlugin = LoadLibraryW(fileName);
6970 if (hPlugin != NULL) {
7071 TTXBindProc bind = NULL;
72+ FARPROC *pbind = (FARPROC *)&bind;
7173 #if defined(_MSC_VER)
7274 if (bind == NULL)
73- bind = (TTXBindProc)GetProcAddress(hPlugin, "_TTXBind@8");
75+ *pbind = GetProcAddress(hPlugin, "_TTXBind@8");
7476 #else
7577 if (bind == NULL)
76- bind = (TTXBindProc)GetProcAddress(hPlugin, "TTXBind@8");
78+ *pbind = GetProcAddress(hPlugin, "TTXBind@8");
7779 #endif
7880 if (bind == NULL)
79- bind = (TTXBindProc)GetProcAddress(hPlugin, "TTXBind");
81+ *pbind = GetProcAddress(hPlugin, "TTXBind");
8082 if (bind != NULL) {
8183 TTXExports * exports = (TTXExports *)malloc(sizeof(TTXExports));
8284 if (exports == NULL) {
旧リポジトリブラウザで表示