Download as
Browse Code »

Commit 76dd7ff0dbec8c70796c3bbca030485107fe418c

Authored by perry.werneck@gmail.com
1 parent c5f53824
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Implementando win64

Showing 2 changed files with 176 additions and 158 deletions   Show diff stats
@@ -6,13 +6,13 @@ @@ -6,13 +6,13 @@
6 <Option makefile_is_custom="1" /> 6 <Option makefile_is_custom="1" />
7 <Option execution_dir="." /> 7 <Option execution_dir="." />
8 <Option pch_mode="2" /> 8 <Option pch_mode="2" />
9 - <Option compiler="gcc" /> 9 + <Option compiler="mingw_64_compiler" />
10 <Build> 10 <Build>
11 <Target title="Debug"> 11 <Target title="Debug">
12 - <Option output=".bin/Debug/pw3270" prefix_auto="1" extension_auto="1" />  
13 - <Option object_output=".obj/Debug/" /> 12 + <Option output=".bin\Debug\pw3270" prefix_auto="1" extension_auto="1" />
  13 + <Option object_output=".obj\Debug\" />
14 <Option type="1" /> 14 <Option type="1" />
15 - <Option compiler="gcc" /> 15 + <Option compiler="mingw_64_compiler" />
16 <Option use_console_runner="0" /> 16 <Option use_console_runner="0" />
17 <Compiler> 17 <Compiler>
18 <Add option="-g" /> 18 <Add option="-g" />
@@ -20,10 +20,10 @@ @@ -20,10 +20,10 @@
20 </Compiler> 20 </Compiler>
21 </Target> 21 </Target>
22 <Target title="Release"> 22 <Target title="Release">
23 - <Option output=".bin/Release/pw3270" prefix_auto="1" extension_auto="1" />  
24 - <Option object_output=".obj/Release/" /> 23 + <Option output=".bin\Release\pw3270" prefix_auto="1" extension_auto="1" />
  24 + <Option object_output=".obj\Release\" />
25 <Option type="0" /> 25 <Option type="0" />
26 - <Option compiler="gcc" /> 26 + <Option compiler="mingw_64_compiler" />
27 <Compiler> 27 <Compiler>
28 <Add option="-O2" /> 28 <Add option="-O2" />
29 </Compiler> 29 </Compiler>
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <Compiler> 35 <Compiler>
36 <Add option="-Wall" /> 36 <Add option="-Wall" />
37 <Add option="`pkg-config gtk+-3.0 lib3270 --cflags`" /> 37 <Add option="`pkg-config gtk+-3.0 lib3270 --cflags`" />
38 - <Add directory="src/include" /> 38 + <Add directory="src\include" />
39 </Compiler> 39 </Compiler>
40 <Linker> 40 <Linker>
41 <Add option="`pkg-config gtk+-3.0 lib3270 --libs`" /> 41 <Add option="`pkg-config gtk+-3.0 lib3270 --libs`" />
@@ -45,285 +45,285 @@ @@ -45,285 +45,285 @@
45 <Unit filename="colors.conf" /> 45 <Unit filename="colors.conf" />
46 <Unit filename="configure.ac" /> 46 <Unit filename="configure.ac" />
47 <Unit filename="pw3270.spec.in" /> 47 <Unit filename="pw3270.spec.in" />
48 - <Unit filename="src/include/lib3270.h" />  
49 - <Unit filename="src/include/lib3270/action_table.h" />  
50 - <Unit filename="src/include/lib3270/actions.h" />  
51 - <Unit filename="src/include/lib3270/config.h.in" />  
52 - <Unit filename="src/include/lib3270/filetransfer.h" />  
53 - <Unit filename="src/include/lib3270/log.h" />  
54 - <Unit filename="src/include/lib3270/popup.h" />  
55 - <Unit filename="src/include/lib3270/selection.h" />  
56 - <Unit filename="src/include/lib3270/session.h" />  
57 - <Unit filename="src/include/lib3270/trace.h" />  
58 - <Unit filename="src/include/pw3270.h" />  
59 - <Unit filename="src/include/rules.mak.in" />  
60 - <Unit filename="src/lib3270/3270ds.h" />  
61 - <Unit filename="src/lib3270/Makefile.in" />  
62 - <Unit filename="src/lib3270/X11keysym.h" />  
63 - <Unit filename="src/lib3270/XtGlue.c"> 48 + <Unit filename="src\include\lib3270.h" />
  49 + <Unit filename="src\include\lib3270\action_table.h" />
  50 + <Unit filename="src\include\lib3270\actions.h" />
  51 + <Unit filename="src\include\lib3270\config.h.in" />
  52 + <Unit filename="src\include\lib3270\filetransfer.h" />
  53 + <Unit filename="src\include\lib3270\log.h" />
  54 + <Unit filename="src\include\lib3270\popup.h" />
  55 + <Unit filename="src\include\lib3270\selection.h" />
  56 + <Unit filename="src\include\lib3270\session.h" />
  57 + <Unit filename="src\include\lib3270\trace.h" />
  58 + <Unit filename="src\include\pw3270.h" />
  59 + <Unit filename="src\include\rules.mak.in" />
  60 + <Unit filename="src\lib3270\3270ds.h" />
  61 + <Unit filename="src\lib3270\Makefile.in" />
  62 + <Unit filename="src\lib3270\X11keysym.h" />
  63 + <Unit filename="src\lib3270\XtGlue.c">
64 <Option compilerVar="CC" /> 64 <Option compilerVar="CC" />
65 </Unit> 65 </Unit>
66 - <Unit filename="src/lib3270/actions.c"> 66 + <Unit filename="src\lib3270\actions.c">
67 <Option compilerVar="CC" /> 67 <Option compilerVar="CC" />
68 </Unit> 68 </Unit>
69 - <Unit filename="src/lib3270/actionsc.h" />  
70 - <Unit filename="src/lib3270/ansi.c"> 69 + <Unit filename="src\lib3270\actionsc.h" />
  70 + <Unit filename="src\lib3270\ansi.c">
71 <Option compilerVar="CC" /> 71 <Option compilerVar="CC" />
72 </Unit> 72 </Unit>
73 - <Unit filename="src/lib3270/ansic.h" />  
74 - <Unit filename="src/lib3270/api.h" />  
75 - <Unit filename="src/lib3270/apl.c"> 73 + <Unit filename="src\lib3270\ansic.h" />
  74 + <Unit filename="src\lib3270\api.h" />
  75 + <Unit filename="src\lib3270\apl.c">
76 <Option compilerVar="CC" /> 76 <Option compilerVar="CC" />
77 </Unit> 77 </Unit>
78 - <Unit filename="src/lib3270/aplc.h" />  
79 - <Unit filename="src/lib3270/appres.h" />  
80 - <Unit filename="src/lib3270/arpa_telnet.h" />  
81 - <Unit filename="src/lib3270/bounds.c"> 78 + <Unit filename="src\lib3270\aplc.h" />
  79 + <Unit filename="src\lib3270\appres.h" />
  80 + <Unit filename="src\lib3270\arpa_telnet.h" />
  81 + <Unit filename="src\lib3270\bounds.c">
82 <Option compilerVar="CC" /> 82 <Option compilerVar="CC" />
83 </Unit> 83 </Unit>
84 - <Unit filename="src/lib3270/cg.h" />  
85 - <Unit filename="src/lib3270/charset.c"> 84 + <Unit filename="src\lib3270\cg.h" />
  85 + <Unit filename="src\lib3270\charset.c">
86 <Option compilerVar="CC" /> 86 <Option compilerVar="CC" />
87 </Unit> 87 </Unit>
88 - <Unit filename="src/lib3270/charsetc.h" />  
89 - <Unit filename="src/lib3270/childc.h" />  
90 - <Unit filename="src/lib3270/ctlr.c"> 88 + <Unit filename="src\lib3270\charsetc.h" />
  89 + <Unit filename="src\lib3270\childc.h" />
  90 + <Unit filename="src\lib3270\ctlr.c">
91 <Option compilerVar="CC" /> 91 <Option compilerVar="CC" />
92 </Unit> 92 </Unit>
93 - <Unit filename="src/lib3270/ctlr.h" />  
94 - <Unit filename="src/lib3270/ctlrc.h" />  
95 - <Unit filename="src/lib3270/dialogc.h" />  
96 - <Unit filename="src/lib3270/ft.c"> 93 + <Unit filename="src\lib3270\ctlr.h" />
  94 + <Unit filename="src\lib3270\ctlrc.h" />
  95 + <Unit filename="src\lib3270\dialogc.h" />
  96 + <Unit filename="src\lib3270\ft.c">
97 <Option compilerVar="CC" /> 97 <Option compilerVar="CC" />
98 </Unit> 98 </Unit>
99 - <Unit filename="src/lib3270/ft_cut.c"> 99 + <Unit filename="src\lib3270\ft_cut.c">
100 <Option compilerVar="CC" /> 100 <Option compilerVar="CC" />
101 </Unit> 101 </Unit>
102 - <Unit filename="src/lib3270/ft_cut_ds.h" />  
103 - <Unit filename="src/lib3270/ft_cutc.h" />  
104 - <Unit filename="src/lib3270/ft_dft.c"> 102 + <Unit filename="src\lib3270\ft_cut_ds.h" />
  103 + <Unit filename="src\lib3270\ft_cutc.h" />
  104 + <Unit filename="src\lib3270\ft_dft.c">
105 <Option compilerVar="CC" /> 105 <Option compilerVar="CC" />
106 </Unit> 106 </Unit>
107 - <Unit filename="src/lib3270/ft_dft_ds.h" />  
108 - <Unit filename="src/lib3270/ft_dftc.h" />  
109 - <Unit filename="src/lib3270/ftc.h" />  
110 - <Unit filename="src/lib3270/globals.h" />  
111 - <Unit filename="src/lib3270/glue.c"> 107 + <Unit filename="src\lib3270\ft_dft_ds.h" />
  108 + <Unit filename="src\lib3270\ft_dftc.h" />
  109 + <Unit filename="src\lib3270\ftc.h" />
  110 + <Unit filename="src\lib3270\globals.h" />
  111 + <Unit filename="src\lib3270\glue.c">
112 <Option compilerVar="CC" /> 112 <Option compilerVar="CC" />
113 </Unit> 113 </Unit>
114 - <Unit filename="src/lib3270/gluec.h" />  
115 - <Unit filename="src/lib3270/host.c"> 114 + <Unit filename="src\lib3270\gluec.h" />
  115 + <Unit filename="src\lib3270\host.c">
116 <Option compilerVar="CC" /> 116 <Option compilerVar="CC" />
117 </Unit> 117 </Unit>
118 - <Unit filename="src/lib3270/hostc.h" />  
119 - <Unit filename="src/lib3270/icmdc.h" />  
120 - <Unit filename="src/lib3270/init.c"> 118 + <Unit filename="src\lib3270\hostc.h" />
  119 + <Unit filename="src\lib3270\icmdc.h" />
  120 + <Unit filename="src\lib3270\init.c">
121 <Option compilerVar="CC" /> 121 <Option compilerVar="CC" />
122 </Unit> 122 </Unit>
123 - <Unit filename="src/lib3270/keypadc.h" />  
124 - <Unit filename="src/lib3270/kybd.c"> 123 + <Unit filename="src\lib3270\keypadc.h" />
  124 + <Unit filename="src\lib3270\kybd.c">
125 <Option compilerVar="CC" /> 125 <Option compilerVar="CC" />
126 </Unit> 126 </Unit>
127 - <Unit filename="src/lib3270/kybdc.h" />  
128 - <Unit filename="src/lib3270/localdefs.h" />  
129 - <Unit filename="src/lib3270/log.c"> 127 + <Unit filename="src\lib3270\kybdc.h" />
  128 + <Unit filename="src\lib3270\localdefs.h" />
  129 + <Unit filename="src\lib3270\log.c">
130 <Option compilerVar="CC" /> 130 <Option compilerVar="CC" />
131 </Unit> 131 </Unit>
132 - <Unit filename="src/lib3270/macros.c"> 132 + <Unit filename="src\lib3270\macros.c">
133 <Option compilerVar="CC" /> 133 <Option compilerVar="CC" />
134 </Unit> 134 </Unit>
135 - <Unit filename="src/lib3270/mkfb.c"> 135 + <Unit filename="src\lib3270\mkfb.c">
136 <Option compilerVar="CC" /> 136 <Option compilerVar="CC" />
137 </Unit> 137 </Unit>
138 - <Unit filename="src/lib3270/objects.h" />  
139 - <Unit filename="src/lib3270/paste.c"> 138 + <Unit filename="src\lib3270\objects.h" />
  139 + <Unit filename="src\lib3270\paste.c">
140 <Option compilerVar="CC" /> 140 <Option compilerVar="CC" />
141 </Unit> 141 </Unit>
142 - <Unit filename="src/lib3270/popupsc.h" />  
143 - <Unit filename="src/lib3270/printc.h" />  
144 - <Unit filename="src/lib3270/printerc.h" />  
145 - <Unit filename="src/lib3270/proxy.c"> 142 + <Unit filename="src\lib3270\popupsc.h" />
  143 + <Unit filename="src\lib3270\printc.h" />
  144 + <Unit filename="src\lib3270\printerc.h" />
  145 + <Unit filename="src\lib3270\proxy.c">
146 <Option compilerVar="CC" /> 146 <Option compilerVar="CC" />
147 </Unit> 147 </Unit>
148 - <Unit filename="src/lib3270/proxyc.h" />  
149 - <Unit filename="src/lib3270/resolver.c"> 148 + <Unit filename="src\lib3270\proxyc.h" />
  149 + <Unit filename="src\lib3270\resolver.c">
150 <Option compilerVar="CC" /> 150 <Option compilerVar="CC" />
151 </Unit> 151 </Unit>
152 - <Unit filename="src/lib3270/resolverc.h" />  
153 - <Unit filename="src/lib3270/resources.c"> 152 + <Unit filename="src\lib3270\resolverc.h" />
  153 + <Unit filename="src\lib3270\resources.c">
154 <Option compilerVar="CC" /> 154 <Option compilerVar="CC" />
155 </Unit> 155 </Unit>
156 - <Unit filename="src/lib3270/resources.h" />  
157 - <Unit filename="src/lib3270/rpq.c"> 156 + <Unit filename="src\lib3270\resources.h" />
  157 + <Unit filename="src\lib3270\rpq.c">
158 <Option compilerVar="CC" /> 158 <Option compilerVar="CC" />
159 </Unit> 159 </Unit>
160 - <Unit filename="src/lib3270/savec.h" />  
161 - <Unit filename="src/lib3270/screen.c"> 160 + <Unit filename="src\lib3270\savec.h" />
  161 + <Unit filename="src\lib3270\screen.c">
162 <Option compilerVar="CC" /> 162 <Option compilerVar="CC" />
163 </Unit> 163 </Unit>
164 - <Unit filename="src/lib3270/screen.h" />  
165 - <Unit filename="src/lib3270/screenc.h" />  
166 - <Unit filename="src/lib3270/scrollc.h" />  
167 - <Unit filename="src/lib3270/see.c"> 164 + <Unit filename="src\lib3270\screen.h" />
  165 + <Unit filename="src\lib3270\screenc.h" />
  166 + <Unit filename="src\lib3270\scrollc.h" />
  167 + <Unit filename="src\lib3270\see.c">
168 <Option compilerVar="CC" /> 168 <Option compilerVar="CC" />
169 </Unit> 169 </Unit>
170 - <Unit filename="src/lib3270/seec.h" />  
171 - <Unit filename="src/lib3270/selection.c"> 170 + <Unit filename="src\lib3270\seec.h" />
  171 + <Unit filename="src\lib3270\selection.c">
172 <Option compilerVar="CC" /> 172 <Option compilerVar="CC" />
173 </Unit> 173 </Unit>
174 - <Unit filename="src/lib3270/sf.c"> 174 + <Unit filename="src\lib3270\sf.c">
175 <Option compilerVar="CC" /> 175 <Option compilerVar="CC" />
176 </Unit> 176 </Unit>
177 - <Unit filename="src/lib3270/sfc.h" />  
178 - <Unit filename="src/lib3270/shlobj_missing.h" />  
179 - <Unit filename="src/lib3270/statusc.h" />  
180 - <Unit filename="src/lib3270/tables.c"> 177 + <Unit filename="src\lib3270\sfc.h" />
  178 + <Unit filename="src\lib3270\shlobj_missing.h" />
  179 + <Unit filename="src\lib3270\statusc.h" />
  180 + <Unit filename="src\lib3270\tables.c">
181 <Option compilerVar="CC" /> 181 <Option compilerVar="CC" />
182 </Unit> 182 </Unit>
183 - <Unit filename="src/lib3270/tablesc.h" />  
184 - <Unit filename="src/lib3270/telnet.c"> 183 + <Unit filename="src\lib3270\tablesc.h" />
  184 + <Unit filename="src\lib3270\telnet.c">
185 <Option compilerVar="CC" /> 185 <Option compilerVar="CC" />
186 </Unit> 186 </Unit>
187 - <Unit filename="src/lib3270/telnetc.h" />  
188 - <Unit filename="src/lib3270/testprogram.c"> 187 + <Unit filename="src\lib3270\telnetc.h" />
  188 + <Unit filename="src\lib3270\testprogram.c">
189 <Option compilerVar="CC" /> 189 <Option compilerVar="CC" />
190 </Unit> 190 </Unit>
191 - <Unit filename="src/lib3270/tn3270e.h" />  
192 - <Unit filename="src/lib3270/toggle.h" />  
193 - <Unit filename="src/lib3270/toggles.c"> 191 + <Unit filename="src\lib3270\tn3270e.h" />
  192 + <Unit filename="src\lib3270\toggle.h" />
  193 + <Unit filename="src\lib3270\toggles.c">
194 <Option compilerVar="CC" /> 194 <Option compilerVar="CC" />
195 </Unit> 195 </Unit>
196 - <Unit filename="src/lib3270/togglesc.h" />  
197 - <Unit filename="src/lib3270/trace_ds.c"> 196 + <Unit filename="src\lib3270\togglesc.h" />
  197 + <Unit filename="src\lib3270\trace_ds.c">
198 <Option compilerVar="CC" /> 198 <Option compilerVar="CC" />
199 </Unit> 199 </Unit>
200 - <Unit filename="src/lib3270/trace_dsc.h" />  
201 - <Unit filename="src/lib3270/utf8.c"> 200 + <Unit filename="src\lib3270\trace_dsc.h" />
  201 + <Unit filename="src\lib3270\utf8.c">
202 <Option compilerVar="CC" /> 202 <Option compilerVar="CC" />
203 </Unit> 203 </Unit>
204 - <Unit filename="src/lib3270/utf8c.h" />  
205 - <Unit filename="src/lib3270/util.c"> 204 + <Unit filename="src\lib3270\utf8c.h" />
  205 + <Unit filename="src\lib3270\util.c">
206 <Option compilerVar="CC" /> 206 <Option compilerVar="CC" />
207 </Unit> 207 </Unit>
208 - <Unit filename="src/lib3270/utilc.h" />  
209 - <Unit filename="src/lib3270/w3misc.c"> 208 + <Unit filename="src\lib3270\utilc.h" />
  209 + <Unit filename="src\lib3270\w3misc.c">
210 <Option compilerVar="CC" /> 210 <Option compilerVar="CC" />
211 </Unit> 211 </Unit>
212 - <Unit filename="src/lib3270/w3miscc.h" />  
213 - <Unit filename="src/lib3270/widec.h" />  
214 - <Unit filename="src/lib3270/winvers.c"> 212 + <Unit filename="src\lib3270\w3miscc.h" />
  213 + <Unit filename="src\lib3270\widec.h" />
  214 + <Unit filename="src\lib3270\winvers.c">
215 <Option compilerVar="CC" /> 215 <Option compilerVar="CC" />
216 </Unit> 216 </Unit>
217 - <Unit filename="src/lib3270/winversc.h" />  
218 - <Unit filename="src/lib3270/xio.c"> 217 + <Unit filename="src\lib3270\winversc.h" />
  218 + <Unit filename="src\lib3270\xio.c">
219 <Option compilerVar="CC" /> 219 <Option compilerVar="CC" />
220 </Unit> 220 </Unit>
221 - <Unit filename="src/lib3270/xioc.h" />  
222 - <Unit filename="src/lib3270/xl.h" />  
223 - <Unit filename="src/pw3270/Makefile.in" />  
224 - <Unit filename="src/pw3270/actions.c"> 221 + <Unit filename="src\lib3270\xioc.h" />
  222 + <Unit filename="src\lib3270\xl.h" />
  223 + <Unit filename="src\pw3270\Makefile.in" />
  224 + <Unit filename="src\pw3270\actions.c">
225 <Option compilerVar="CC" /> 225 <Option compilerVar="CC" />
226 </Unit> 226 </Unit>
227 - <Unit filename="src/pw3270/colors.c"> 227 + <Unit filename="src\pw3270\colors.c">
228 <Option compilerVar="CC" /> 228 <Option compilerVar="CC" />
229 </Unit> 229 </Unit>
230 - <Unit filename="src/pw3270/common/common.h.in" />  
231 - <Unit filename="src/pw3270/common/config.c"> 230 + <Unit filename="src\pw3270\common\common.h.in" />
  231 + <Unit filename="src\pw3270\common\config.c">
232 <Option compilerVar="CC" /> 232 <Option compilerVar="CC" />
233 </Unit> 233 </Unit>
234 - <Unit filename="src/pw3270/common/sources.mak" />  
235 - <Unit filename="src/pw3270/dialog.c"> 234 + <Unit filename="src\pw3270\common\sources.mak" />
  235 + <Unit filename="src\pw3270\dialog.c">
236 <Option compilerVar="CC" /> 236 <Option compilerVar="CC" />
237 </Unit> 237 </Unit>
238 - <Unit filename="src/pw3270/filetransfer.c"> 238 + <Unit filename="src\pw3270\filetransfer.c">
239 <Option compilerVar="CC" /> 239 <Option compilerVar="CC" />
240 </Unit> 240 </Unit>
241 - <Unit filename="src/pw3270/filetransfer.h" />  
242 - <Unit filename="src/pw3270/fonts.c"> 241 + <Unit filename="src\pw3270\filetransfer.h" />
  242 + <Unit filename="src\pw3270\fonts.c">
243 <Option compilerVar="CC" /> 243 <Option compilerVar="CC" />
244 </Unit> 244 </Unit>
245 - <Unit filename="src/pw3270/globals.h" />  
246 - <Unit filename="src/pw3270/main.c"> 245 + <Unit filename="src\pw3270\globals.h" />
  246 + <Unit filename="src\pw3270\main.c">
247 <Option compilerVar="CC" /> 247 <Option compilerVar="CC" />
248 </Unit> 248 </Unit>
249 - <Unit filename="src/pw3270/print.c"> 249 + <Unit filename="src\pw3270\print.c">
250 <Option compilerVar="CC" /> 250 <Option compilerVar="CC" />
251 </Unit> 251 </Unit>
252 - <Unit filename="src/pw3270/uiparser/Makefile.in" />  
253 - <Unit filename="src/pw3270/uiparser/accelerator.c"> 252 + <Unit filename="src\pw3270\uiparser\Makefile.in" />
  253 + <Unit filename="src\pw3270\uiparser\accelerator.c">
254 <Option compilerVar="CC" /> 254 <Option compilerVar="CC" />
255 </Unit> 255 </Unit>
256 - <Unit filename="src/pw3270/uiparser/action.c"> 256 + <Unit filename="src\pw3270\uiparser\action.c">
257 <Option compilerVar="CC" /> 257 <Option compilerVar="CC" />
258 </Unit> 258 </Unit>
259 - <Unit filename="src/pw3270/uiparser/menu.c"> 259 + <Unit filename="src\pw3270\uiparser\menu.c">
260 <Option compilerVar="CC" /> 260 <Option compilerVar="CC" />
261 </Unit> 261 </Unit>
262 - <Unit filename="src/pw3270/uiparser/menubar.c"> 262 + <Unit filename="src\pw3270\uiparser\menubar.c">
263 <Option compilerVar="CC" /> 263 <Option compilerVar="CC" />
264 </Unit> 264 </Unit>
265 - <Unit filename="src/pw3270/uiparser/menuitem.c"> 265 + <Unit filename="src\pw3270\uiparser\menuitem.c">
266 <Option compilerVar="CC" /> 266 <Option compilerVar="CC" />
267 </Unit> 267 </Unit>
268 - <Unit filename="src/pw3270/uiparser/parsefile.c"> 268 + <Unit filename="src\pw3270\uiparser\parsefile.c">
269 <Option compilerVar="CC" /> 269 <Option compilerVar="CC" />
270 </Unit> 270 </Unit>
271 - <Unit filename="src/pw3270/uiparser/parser.c"> 271 + <Unit filename="src\pw3270\uiparser\parser.c">
272 <Option compilerVar="CC" /> 272 <Option compilerVar="CC" />
273 </Unit> 273 </Unit>
274 - <Unit filename="src/pw3270/uiparser/parser.h" />  
275 - <Unit filename="src/pw3270/uiparser/popup.c"> 274 + <Unit filename="src\pw3270\uiparser\parser.h" />
  275 + <Unit filename="src\pw3270\uiparser\popup.c">
276 <Option compilerVar="CC" /> 276 <Option compilerVar="CC" />
277 </Unit> 277 </Unit>
278 - <Unit filename="src/pw3270/uiparser/private.h" />  
279 - <Unit filename="src/pw3270/uiparser/script.c"> 278 + <Unit filename="src\pw3270\uiparser\private.h" />
  279 + <Unit filename="src\pw3270\uiparser\script.c">
280 <Option compilerVar="CC" /> 280 <Option compilerVar="CC" />
281 </Unit> 281 </Unit>
282 - <Unit filename="src/pw3270/uiparser/separator.c"> 282 + <Unit filename="src\pw3270\uiparser\separator.c">
283 <Option compilerVar="CC" /> 283 <Option compilerVar="CC" />
284 </Unit> 284 </Unit>
285 - <Unit filename="src/pw3270/uiparser/sources.mak" />  
286 - <Unit filename="src/pw3270/uiparser/toolbar.c"> 285 + <Unit filename="src\pw3270\uiparser\sources.mak" />
  286 + <Unit filename="src\pw3270\uiparser\toolbar.c">
287 <Option compilerVar="CC" /> 287 <Option compilerVar="CC" />
288 </Unit> 288 </Unit>
289 - <Unit filename="src/pw3270/uiparser/toolitem.c"> 289 + <Unit filename="src\pw3270\uiparser\toolitem.c">
290 <Option compilerVar="CC" /> 290 <Option compilerVar="CC" />
291 </Unit> 291 </Unit>
292 - <Unit filename="src/pw3270/v3270/accessible.c"> 292 + <Unit filename="src\pw3270\v3270\accessible.c">
293 <Option compilerVar="CC" /> 293 <Option compilerVar="CC" />
294 </Unit> 294 </Unit>
295 - <Unit filename="src/pw3270/v3270/accessible.h" />  
296 - <Unit filename="src/pw3270/v3270/draw.c"> 295 + <Unit filename="src\pw3270\v3270\accessible.h" />
  296 + <Unit filename="src\pw3270\v3270\draw.c">
297 <Option compilerVar="CC" /> 297 <Option compilerVar="CC" />
298 </Unit> 298 </Unit>
299 - <Unit filename="src/pw3270/v3270/genmarshal" />  
300 - <Unit filename="src/pw3270/v3270/iocallback.c"> 299 + <Unit filename="src\pw3270\v3270\genmarshal" />
  300 + <Unit filename="src\pw3270\v3270\iocallback.c">
301 <Option compilerVar="CC" /> 301 <Option compilerVar="CC" />
302 </Unit> 302 </Unit>
303 - <Unit filename="src/pw3270/v3270/keyboard.c"> 303 + <Unit filename="src\pw3270\v3270\keyboard.c">
304 <Option compilerVar="CC" /> 304 <Option compilerVar="CC" />
305 </Unit> 305 </Unit>
306 - <Unit filename="src/pw3270/v3270/mouse.c"> 306 + <Unit filename="src\pw3270\v3270\mouse.c">
307 <Option compilerVar="CC" /> 307 <Option compilerVar="CC" />
308 </Unit> 308 </Unit>
309 - <Unit filename="src/pw3270/v3270/oia.c"> 309 + <Unit filename="src\pw3270\v3270\oia.c">
310 <Option compilerVar="CC" /> 310 <Option compilerVar="CC" />
311 </Unit> 311 </Unit>
312 - <Unit filename="src/pw3270/v3270/private.h" />  
313 - <Unit filename="src/pw3270/v3270/selection.c"> 312 + <Unit filename="src\pw3270\v3270\private.h" />
  313 + <Unit filename="src\pw3270\v3270\selection.c">
314 <Option compilerVar="CC" /> 314 <Option compilerVar="CC" />
315 </Unit> 315 </Unit>
316 - <Unit filename="src/pw3270/v3270/sources.mak" />  
317 - <Unit filename="src/pw3270/v3270/v3270.h" />  
318 - <Unit filename="src/pw3270/v3270/widget.c"> 316 + <Unit filename="src\pw3270\v3270\sources.mak" />
  317 + <Unit filename="src\pw3270\v3270\v3270.h" />
  318 + <Unit filename="src\pw3270\v3270\widget.c">
319 <Option compilerVar="CC" /> 319 <Option compilerVar="CC" />
320 </Unit> 320 </Unit>
321 - <Unit filename="src/pw3270/window.c"> 321 + <Unit filename="src\pw3270\window.c">
322 <Option compilerVar="CC" /> 322 <Option compilerVar="CC" />
323 </Unit> 323 </Unit>
324 - <Unit filename="src/tools/Makefile.in" />  
325 - <Unit filename="ui/00default.xml" />  
326 - <Unit filename="ui/99debug.xml" /> 324 + <Unit filename="src\tools\Makefile.in" />
  325 + <Unit filename="ui\00default.xml" />
  326 + <Unit filename="ui\99debug.xml" />
327 <Extensions> 327 <Extensions>
328 <code_completion /> 328 <code_completion />
329 <debugger /> 329 <debugger />
src/lib3270/telnet.c
  Diff comments   View file @76dd7ff
@@ -37,6 +37,11 @@ @@ -37,6 +37,11 @@
37 * the given IBM host. 37 * the given IBM host.
38 */ 38 */
39 39
  40 +#if defined(_WIN32)
  41 + #include <winsock2.h>
  42 + #include <windows.h>
  43 +#endif
  44 +
40 #include <lib3270/config.h> 45 #include <lib3270/config.h>
41 #if defined(HAVE_LIBSSL) 46 #if defined(HAVE_LIBSSL)
42 #include <openssl/ssl.h> 47 #include <openssl/ssl.h>
@@ -47,7 +52,6 @@ @@ -47,7 +52,6 @@
47 #include <errno.h> 52 #include <errno.h>
48 53
49 #if defined(_WIN32) 54 #if defined(_WIN32)
50 - #include <winsock2.h>  
51 #include <ws2tcpip.h> 55 #include <ws2tcpip.h>
52 #else 56 #else
53 #include <sys/socket.h> 57 #include <sys/socket.h>
@@ -3163,6 +3167,18 @@ net_snap_options(void) @@ -3163,6 +3167,18 @@ net_snap_options(void)
3163 */ 3167 */
3164 static int non_blocking(H3270 *session, Boolean on) 3168 static int non_blocking(H3270 *session, Boolean on)
3165 { 3169 {
  3170 +# if defined(FIONBIO)
  3171 +
  3172 + int i = on ? 1 : 0;
  3173 +
  3174 + if (SOCK_IOCTL(session->sock, FIONBIO, (int *) &i) < 0)
  3175 + {
  3176 + popup_a_sockerr(session, N_( "ioctl(%s)" ), "FIONBIO");
  3177 + return -1;
  3178 + }
  3179 +
  3180 +#else
  3181 +
3166 int f; 3182 int f;
3167 3183
3168 if ((f = fcntl(session->sock, F_GETFL, 0)) == -1) 3184 if ((f = fcntl(session->sock, F_GETFL, 0)) == -1)
@@ -3182,6 +3198,8 @@ static int non_blocking(H3270 *session, Boolean on) @@ -3182,6 +3198,8 @@ static int non_blocking(H3270 *session, Boolean on)
3182 return -1; 3198 return -1;
3183 } 3199 }
3184 3200
  3201 +#endif // FIONBIO
  3202 +
3185 return 0; 3203 return 0;
3186 } 3204 }
3187 3205