From 76dd7ff0dbec8c70796c3bbca030485107fe418c Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Thu, 10 May 2012 15:25:11 +0000
Subject: [PATCH] Implementando win64

---
 pw3270.cbp           | 314 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/lib3270/telnet.c |  20 +++++++++++++++++++-
 2 files changed, 176 insertions(+), 158 deletions(-)

diff --git a/pw3270.cbp b/pw3270.cbp
index 946d8b4..a418b3b 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -6,13 +6,13 @@
 		<Option makefile_is_custom="1" />
 		<Option execution_dir="." />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw_64_compiler" />
 		<Build>
 			<Target title="Debug">
-				<Option output=".bin/Debug/pw3270" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj/Debug/" />
+				<Option output=".bin\Debug\pw3270" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj\Debug\" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64_compiler" />
 				<Option use_console_runner="0" />
 				<Compiler>
 					<Add option="-g" />
@@ -20,10 +20,10 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output=".bin/Release/pw3270" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj/Release/" />
+				<Option output=".bin\Release\pw3270" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj\Release\" />
 				<Option type="0" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw_64_compiler" />
 				<Compiler>
 					<Add option="-O2" />
 				</Compiler>
@@ -35,7 +35,7 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add option="`pkg-config gtk+-3.0 lib3270 --cflags`" />
-			<Add directory="src/include" />
+			<Add directory="src\include" />
 		</Compiler>
 		<Linker>
 			<Add option="`pkg-config gtk+-3.0 lib3270 --libs`" />
@@ -45,285 +45,285 @@
 		<Unit filename="colors.conf" />
 		<Unit filename="configure.ac" />
 		<Unit filename="pw3270.spec.in" />
-		<Unit filename="src/include/lib3270.h" />
-		<Unit filename="src/include/lib3270/action_table.h" />
-		<Unit filename="src/include/lib3270/actions.h" />
-		<Unit filename="src/include/lib3270/config.h.in" />
-		<Unit filename="src/include/lib3270/filetransfer.h" />
-		<Unit filename="src/include/lib3270/log.h" />
-		<Unit filename="src/include/lib3270/popup.h" />
-		<Unit filename="src/include/lib3270/selection.h" />
-		<Unit filename="src/include/lib3270/session.h" />
-		<Unit filename="src/include/lib3270/trace.h" />
-		<Unit filename="src/include/pw3270.h" />
-		<Unit filename="src/include/rules.mak.in" />
-		<Unit filename="src/lib3270/3270ds.h" />
-		<Unit filename="src/lib3270/Makefile.in" />
-		<Unit filename="src/lib3270/X11keysym.h" />
-		<Unit filename="src/lib3270/XtGlue.c">
+		<Unit filename="src\include\lib3270.h" />
+		<Unit filename="src\include\lib3270\action_table.h" />
+		<Unit filename="src\include\lib3270\actions.h" />
+		<Unit filename="src\include\lib3270\config.h.in" />
+		<Unit filename="src\include\lib3270\filetransfer.h" />
+		<Unit filename="src\include\lib3270\log.h" />
+		<Unit filename="src\include\lib3270\popup.h" />
+		<Unit filename="src\include\lib3270\selection.h" />
+		<Unit filename="src\include\lib3270\session.h" />
+		<Unit filename="src\include\lib3270\trace.h" />
+		<Unit filename="src\include\pw3270.h" />
+		<Unit filename="src\include\rules.mak.in" />
+		<Unit filename="src\lib3270\3270ds.h" />
+		<Unit filename="src\lib3270\Makefile.in" />
+		<Unit filename="src\lib3270\X11keysym.h" />
+		<Unit filename="src\lib3270\XtGlue.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/actions.c">
+		<Unit filename="src\lib3270\actions.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/actionsc.h" />
-		<Unit filename="src/lib3270/ansi.c">
+		<Unit filename="src\lib3270\actionsc.h" />
+		<Unit filename="src\lib3270\ansi.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/ansic.h" />
-		<Unit filename="src/lib3270/api.h" />
-		<Unit filename="src/lib3270/apl.c">
+		<Unit filename="src\lib3270\ansic.h" />
+		<Unit filename="src\lib3270\api.h" />
+		<Unit filename="src\lib3270\apl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/aplc.h" />
-		<Unit filename="src/lib3270/appres.h" />
-		<Unit filename="src/lib3270/arpa_telnet.h" />
-		<Unit filename="src/lib3270/bounds.c">
+		<Unit filename="src\lib3270\aplc.h" />
+		<Unit filename="src\lib3270\appres.h" />
+		<Unit filename="src\lib3270\arpa_telnet.h" />
+		<Unit filename="src\lib3270\bounds.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/cg.h" />
-		<Unit filename="src/lib3270/charset.c">
+		<Unit filename="src\lib3270\cg.h" />
+		<Unit filename="src\lib3270\charset.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/charsetc.h" />
-		<Unit filename="src/lib3270/childc.h" />
-		<Unit filename="src/lib3270/ctlr.c">
+		<Unit filename="src\lib3270\charsetc.h" />
+		<Unit filename="src\lib3270\childc.h" />
+		<Unit filename="src\lib3270\ctlr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/ctlr.h" />
-		<Unit filename="src/lib3270/ctlrc.h" />
-		<Unit filename="src/lib3270/dialogc.h" />
-		<Unit filename="src/lib3270/ft.c">
+		<Unit filename="src\lib3270\ctlr.h" />
+		<Unit filename="src\lib3270\ctlrc.h" />
+		<Unit filename="src\lib3270\dialogc.h" />
+		<Unit filename="src\lib3270\ft.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/ft_cut.c">
+		<Unit filename="src\lib3270\ft_cut.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/ft_cut_ds.h" />
-		<Unit filename="src/lib3270/ft_cutc.h" />
-		<Unit filename="src/lib3270/ft_dft.c">
+		<Unit filename="src\lib3270\ft_cut_ds.h" />
+		<Unit filename="src\lib3270\ft_cutc.h" />
+		<Unit filename="src\lib3270\ft_dft.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/ft_dft_ds.h" />
-		<Unit filename="src/lib3270/ft_dftc.h" />
-		<Unit filename="src/lib3270/ftc.h" />
-		<Unit filename="src/lib3270/globals.h" />
-		<Unit filename="src/lib3270/glue.c">
+		<Unit filename="src\lib3270\ft_dft_ds.h" />
+		<Unit filename="src\lib3270\ft_dftc.h" />
+		<Unit filename="src\lib3270\ftc.h" />
+		<Unit filename="src\lib3270\globals.h" />
+		<Unit filename="src\lib3270\glue.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/gluec.h" />
-		<Unit filename="src/lib3270/host.c">
+		<Unit filename="src\lib3270\gluec.h" />
+		<Unit filename="src\lib3270\host.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/hostc.h" />
-		<Unit filename="src/lib3270/icmdc.h" />
-		<Unit filename="src/lib3270/init.c">
+		<Unit filename="src\lib3270\hostc.h" />
+		<Unit filename="src\lib3270\icmdc.h" />
+		<Unit filename="src\lib3270\init.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/keypadc.h" />
-		<Unit filename="src/lib3270/kybd.c">
+		<Unit filename="src\lib3270\keypadc.h" />
+		<Unit filename="src\lib3270\kybd.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/kybdc.h" />
-		<Unit filename="src/lib3270/localdefs.h" />
-		<Unit filename="src/lib3270/log.c">
+		<Unit filename="src\lib3270\kybdc.h" />
+		<Unit filename="src\lib3270\localdefs.h" />
+		<Unit filename="src\lib3270\log.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/macros.c">
+		<Unit filename="src\lib3270\macros.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/mkfb.c">
+		<Unit filename="src\lib3270\mkfb.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/objects.h" />
-		<Unit filename="src/lib3270/paste.c">
+		<Unit filename="src\lib3270\objects.h" />
+		<Unit filename="src\lib3270\paste.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/popupsc.h" />
-		<Unit filename="src/lib3270/printc.h" />
-		<Unit filename="src/lib3270/printerc.h" />
-		<Unit filename="src/lib3270/proxy.c">
+		<Unit filename="src\lib3270\popupsc.h" />
+		<Unit filename="src\lib3270\printc.h" />
+		<Unit filename="src\lib3270\printerc.h" />
+		<Unit filename="src\lib3270\proxy.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/proxyc.h" />
-		<Unit filename="src/lib3270/resolver.c">
+		<Unit filename="src\lib3270\proxyc.h" />
+		<Unit filename="src\lib3270\resolver.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/resolverc.h" />
-		<Unit filename="src/lib3270/resources.c">
+		<Unit filename="src\lib3270\resolverc.h" />
+		<Unit filename="src\lib3270\resources.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/resources.h" />
-		<Unit filename="src/lib3270/rpq.c">
+		<Unit filename="src\lib3270\resources.h" />
+		<Unit filename="src\lib3270\rpq.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/savec.h" />
-		<Unit filename="src/lib3270/screen.c">
+		<Unit filename="src\lib3270\savec.h" />
+		<Unit filename="src\lib3270\screen.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/screen.h" />
-		<Unit filename="src/lib3270/screenc.h" />
-		<Unit filename="src/lib3270/scrollc.h" />
-		<Unit filename="src/lib3270/see.c">
+		<Unit filename="src\lib3270\screen.h" />
+		<Unit filename="src\lib3270\screenc.h" />
+		<Unit filename="src\lib3270\scrollc.h" />
+		<Unit filename="src\lib3270\see.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/seec.h" />
-		<Unit filename="src/lib3270/selection.c">
+		<Unit filename="src\lib3270\seec.h" />
+		<Unit filename="src\lib3270\selection.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/sf.c">
+		<Unit filename="src\lib3270\sf.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/sfc.h" />
-		<Unit filename="src/lib3270/shlobj_missing.h" />
-		<Unit filename="src/lib3270/statusc.h" />
-		<Unit filename="src/lib3270/tables.c">
+		<Unit filename="src\lib3270\sfc.h" />
+		<Unit filename="src\lib3270\shlobj_missing.h" />
+		<Unit filename="src\lib3270\statusc.h" />
+		<Unit filename="src\lib3270\tables.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/tablesc.h" />
-		<Unit filename="src/lib3270/telnet.c">
+		<Unit filename="src\lib3270\tablesc.h" />
+		<Unit filename="src\lib3270\telnet.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/telnetc.h" />
-		<Unit filename="src/lib3270/testprogram.c">
+		<Unit filename="src\lib3270\telnetc.h" />
+		<Unit filename="src\lib3270\testprogram.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/tn3270e.h" />
-		<Unit filename="src/lib3270/toggle.h" />
-		<Unit filename="src/lib3270/toggles.c">
+		<Unit filename="src\lib3270\tn3270e.h" />
+		<Unit filename="src\lib3270\toggle.h" />
+		<Unit filename="src\lib3270\toggles.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/togglesc.h" />
-		<Unit filename="src/lib3270/trace_ds.c">
+		<Unit filename="src\lib3270\togglesc.h" />
+		<Unit filename="src\lib3270\trace_ds.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/trace_dsc.h" />
-		<Unit filename="src/lib3270/utf8.c">
+		<Unit filename="src\lib3270\trace_dsc.h" />
+		<Unit filename="src\lib3270\utf8.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/utf8c.h" />
-		<Unit filename="src/lib3270/util.c">
+		<Unit filename="src\lib3270\utf8c.h" />
+		<Unit filename="src\lib3270\util.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/utilc.h" />
-		<Unit filename="src/lib3270/w3misc.c">
+		<Unit filename="src\lib3270\utilc.h" />
+		<Unit filename="src\lib3270\w3misc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/w3miscc.h" />
-		<Unit filename="src/lib3270/widec.h" />
-		<Unit filename="src/lib3270/winvers.c">
+		<Unit filename="src\lib3270\w3miscc.h" />
+		<Unit filename="src\lib3270\widec.h" />
+		<Unit filename="src\lib3270\winvers.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/winversc.h" />
-		<Unit filename="src/lib3270/xio.c">
+		<Unit filename="src\lib3270\winversc.h" />
+		<Unit filename="src\lib3270\xio.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/xioc.h" />
-		<Unit filename="src/lib3270/xl.h" />
-		<Unit filename="src/pw3270/Makefile.in" />
-		<Unit filename="src/pw3270/actions.c">
+		<Unit filename="src\lib3270\xioc.h" />
+		<Unit filename="src\lib3270\xl.h" />
+		<Unit filename="src\pw3270\Makefile.in" />
+		<Unit filename="src\pw3270\actions.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/colors.c">
+		<Unit filename="src\pw3270\colors.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/common/common.h.in" />
-		<Unit filename="src/pw3270/common/config.c">
+		<Unit filename="src\pw3270\common\common.h.in" />
+		<Unit filename="src\pw3270\common\config.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/common/sources.mak" />
-		<Unit filename="src/pw3270/dialog.c">
+		<Unit filename="src\pw3270\common\sources.mak" />
+		<Unit filename="src\pw3270\dialog.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/filetransfer.c">
+		<Unit filename="src\pw3270\filetransfer.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/filetransfer.h" />
-		<Unit filename="src/pw3270/fonts.c">
+		<Unit filename="src\pw3270\filetransfer.h" />
+		<Unit filename="src\pw3270\fonts.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/globals.h" />
-		<Unit filename="src/pw3270/main.c">
+		<Unit filename="src\pw3270\globals.h" />
+		<Unit filename="src\pw3270\main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/print.c">
+		<Unit filename="src\pw3270\print.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/uiparser/Makefile.in" />
-		<Unit filename="src/pw3270/uiparser/accelerator.c">
+		<Unit filename="src\pw3270\uiparser\Makefile.in" />
+		<Unit filename="src\pw3270\uiparser\accelerator.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/uiparser/action.c">
+		<Unit filename="src\pw3270\uiparser\action.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/uiparser/menu.c">
+		<Unit filename="src\pw3270\uiparser\menu.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/uiparser/menubar.c">
+		<Unit filename="src\pw3270\uiparser\menubar.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/uiparser/menuitem.c">
+		<Unit filename="src\pw3270\uiparser\menuitem.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/uiparser/parsefile.c">
+		<Unit filename="src\pw3270\uiparser\parsefile.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/uiparser/parser.c">
+		<Unit filename="src\pw3270\uiparser\parser.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/uiparser/parser.h" />
-		<Unit filename="src/pw3270/uiparser/popup.c">
+		<Unit filename="src\pw3270\uiparser\parser.h" />
+		<Unit filename="src\pw3270\uiparser\popup.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/uiparser/private.h" />
-		<Unit filename="src/pw3270/uiparser/script.c">
+		<Unit filename="src\pw3270\uiparser\private.h" />
+		<Unit filename="src\pw3270\uiparser\script.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/uiparser/separator.c">
+		<Unit filename="src\pw3270\uiparser\separator.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/uiparser/sources.mak" />
-		<Unit filename="src/pw3270/uiparser/toolbar.c">
+		<Unit filename="src\pw3270\uiparser\sources.mak" />
+		<Unit filename="src\pw3270\uiparser\toolbar.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/uiparser/toolitem.c">
+		<Unit filename="src\pw3270\uiparser\toolitem.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/v3270/accessible.c">
+		<Unit filename="src\pw3270\v3270\accessible.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/v3270/accessible.h" />
-		<Unit filename="src/pw3270/v3270/draw.c">
+		<Unit filename="src\pw3270\v3270\accessible.h" />
+		<Unit filename="src\pw3270\v3270\draw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/v3270/genmarshal" />
-		<Unit filename="src/pw3270/v3270/iocallback.c">
+		<Unit filename="src\pw3270\v3270\genmarshal" />
+		<Unit filename="src\pw3270\v3270\iocallback.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/v3270/keyboard.c">
+		<Unit filename="src\pw3270\v3270\keyboard.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/v3270/mouse.c">
+		<Unit filename="src\pw3270\v3270\mouse.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/v3270/oia.c">
+		<Unit filename="src\pw3270\v3270\oia.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/v3270/private.h" />
-		<Unit filename="src/pw3270/v3270/selection.c">
+		<Unit filename="src\pw3270\v3270\private.h" />
+		<Unit filename="src\pw3270\v3270\selection.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/v3270/sources.mak" />
-		<Unit filename="src/pw3270/v3270/v3270.h" />
-		<Unit filename="src/pw3270/v3270/widget.c">
+		<Unit filename="src\pw3270\v3270\sources.mak" />
+		<Unit filename="src\pw3270\v3270\v3270.h" />
+		<Unit filename="src\pw3270\v3270\widget.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/pw3270/window.c">
+		<Unit filename="src\pw3270\window.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/tools/Makefile.in" />
-		<Unit filename="ui/00default.xml" />
-		<Unit filename="ui/99debug.xml" />
+		<Unit filename="src\tools\Makefile.in" />
+		<Unit filename="ui\00default.xml" />
+		<Unit filename="ui\99debug.xml" />
 		<Extensions>
 			<code_completion />
 			<debugger />
diff --git a/src/lib3270/telnet.c b/src/lib3270/telnet.c
index e3f8290..e98fa2e 100644
--- a/src/lib3270/telnet.c
+++ b/src/lib3270/telnet.c
@@ -37,6 +37,11 @@
  *		the given IBM host.
  */
 
+#if defined(_WIN32)
+	#include <winsock2.h>
+	#include <windows.h>
+#endif
+
 #include <lib3270/config.h>
 #if defined(HAVE_LIBSSL)
 	#include <openssl/ssl.h>
@@ -47,7 +52,6 @@
 #include <errno.h>
 
 #if defined(_WIN32)
-	#include <winsock2.h>
 	#include <ws2tcpip.h>
 #else
 	#include <sys/socket.h>
@@ -3163,6 +3167,18 @@ net_snap_options(void)
  */
 static int non_blocking(H3270 *session, Boolean on)
 {
+# if defined(FIONBIO)
+
+	int i = on ? 1 : 0;
+
+	if (SOCK_IOCTL(session->sock, FIONBIO, (int *) &i) < 0)
+	{
+		popup_a_sockerr(session,  N_( "ioctl(%s)" ), "FIONBIO");
+		return -1;
+	}
+
+#else
+
 	int f;
 
 	if ((f = fcntl(session->sock, F_GETFL, 0)) == -1)
@@ -3182,6 +3198,8 @@ static int non_blocking(H3270 *session, Boolean on)
 		return -1;
 	}
 
+#endif // FIONBIO
+
 	return 0;
 }
 
--
libgit2 0.21.2