Download as
Browse Code »

Commit a9a8902018a7620913b556ae07ab3853ced2cc47

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

Retirando warnings quando compilado em MinGW64

Showing 14 changed files with 234 additions and 221 deletions   Show diff stats
Makefile.in
  Diff comments   View file @a9a8902
... ... @@ -274,6 +274,10 @@ clean:
274 274 @rm -f $(PACKAGE_NAME).png
275 275 @rm -f $(PACKAGE_NAME)-logo.png
276 276 @rm -f *.log
  277 + @echo "$@"
  278 +
  279 +cleanDebug: clean
  280 + @echo "$@"
277 281  
278 282 distclean: clean
279 283 @make -C src/pw3270 distclean
... ... @@ -289,4 +293,5 @@ distclean: clean
289 293 @rm -f $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar*
290 294  
291 295 @rm -f Makefile
  296 + @echo "$@"
292 297  
... ...
pw3270.cbp
  Diff comments   View file @a9a8902
... ... @@ -9,8 +9,8 @@
9 9 <Option compiler="gcc" />
10 10 <Build>
11 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 14 <Option type="1" />
15 15 <Option compiler="gcc" />
16 16 <Option use_console_runner="0" />
... ... @@ -20,8 +20,8 @@
20 20 </Compiler>
21 21 </Target>
22 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 25 <Option type="0" />
26 26 <Option compiler="gcc" />
27 27 <Compiler>
... ... @@ -35,292 +35,293 @@
35 35 <Compiler>
36 36 <Add option="-Wall" />
37 37 <Add option="`pkg-config gtk+-3.0 lib3270 --cflags`" />
38   - <Add directory="src/include" />
  38 + <Add directory="src\include" />
39 39 </Compiler>
40 40 <Linker>
41 41 <Add option="`pkg-config gtk+-3.0 lib3270 --libs`" />
42 42 </Linker>
43 43 <Unit filename="Makefile.in" />
44   - <Unit filename="android/Makefile" />
45   - <Unit filename="android/jni/Android.mk" />
46   - <Unit filename="android/jni/globals.h" />
47   - <Unit filename="android/jni/main.cpp" />
48   - <Unit filename="android/jni/misc.cpp" />
49   - <Unit filename="android/src/br/com/bb/pw3270/PW3270Activity.java" />
50   - <Unit filename="android/src/br/com/bb/pw3270/lib3270.java" />
  44 + <Unit filename="android\Makefile" />
  45 + <Unit filename="android\jni\Android.mk" />
  46 + <Unit filename="android\jni\globals.h" />
  47 + <Unit filename="android\jni\main.cpp" />
  48 + <Unit filename="android\jni\misc.cpp" />
  49 + <Unit filename="android\src\br\com\bb\pw3270\PW3270Activity.java" />
  50 + <Unit filename="android\src\br\com\bb\pw3270\lib3270.java" />
51 51 <Unit filename="autogen.sh" />
52 52 <Unit filename="colors.conf" />
53 53 <Unit filename="configure.ac" />
54 54 <Unit filename="pw3270.spec.in" />
55   - <Unit filename="src/include/lib3270.h" />
56   - <Unit filename="src/include/lib3270/action_table.h" />
57   - <Unit filename="src/include/lib3270/actions.h" />
58   - <Unit filename="src/include/lib3270/config.h.in" />
59   - <Unit filename="src/include/lib3270/filetransfer.h" />
60   - <Unit filename="src/include/lib3270/html.h" />
61   - <Unit filename="src/include/lib3270/log.h" />
62   - <Unit filename="src/include/lib3270/macros.h" />
63   - <Unit filename="src/include/lib3270/popup.h" />
64   - <Unit filename="src/include/lib3270/selection.h" />
65   - <Unit filename="src/include/lib3270/session.h" />
66   - <Unit filename="src/include/lib3270/trace.h" />
67   - <Unit filename="src/include/lib3270/v3270.h" />
68   - <Unit filename="src/include/pw3270.h" />
69   - <Unit filename="src/include/rules.mak.in" />
70   - <Unit filename="src/lib3270/3270ds.h" />
71   - <Unit filename="src/lib3270/Makefile.in" />
72   - <Unit filename="src/lib3270/X11keysym.h" />
73   - <Unit filename="src/lib3270/actionsc.h" />
74   - <Unit filename="src/lib3270/ansi.c">
  55 + <Unit filename="src\include\lib3270.h" />
  56 + <Unit filename="src\include\lib3270\action_table.h" />
  57 + <Unit filename="src\include\lib3270\actions.h" />
  58 + <Unit filename="src\include\lib3270\config.h.in" />
  59 + <Unit filename="src\include\lib3270\filetransfer.h" />
  60 + <Unit filename="src\include\lib3270\html.h" />
  61 + <Unit filename="src\include\lib3270\log.h" />
  62 + <Unit filename="src\include\lib3270\macros.h" />
  63 + <Unit filename="src\include\lib3270\popup.h" />
  64 + <Unit filename="src\include\lib3270\selection.h" />
  65 + <Unit filename="src\include\lib3270\session.h" />
  66 + <Unit filename="src\include\lib3270\trace.h" />
  67 + <Unit filename="src\include\lib3270\v3270.h" />
  68 + <Unit filename="src\include\pw3270.h" />
  69 + <Unit filename="src\include\rules.mak.in" />
  70 + <Unit filename="src\lib3270\3270ds.h" />
  71 + <Unit filename="src\lib3270\Makefile.in" />
  72 + <Unit filename="src\lib3270\X11keysym.h" />
  73 + <Unit filename="src\lib3270\actionsc.h" />
  74 + <Unit filename="src\lib3270\ansi.c">
75 75 <Option compilerVar="CC" />
76 76 </Unit>
77   - <Unit filename="src/lib3270/ansic.h" />
78   - <Unit filename="src/lib3270/api.h" />
79   - <Unit filename="src/lib3270/arpa_telnet.h" />
80   - <Unit filename="src/lib3270/bounds.c">
  77 + <Unit filename="src\lib3270\ansic.h" />
  78 + <Unit filename="src\lib3270\api.h" />
  79 + <Unit filename="src\lib3270\arpa_telnet.h" />
  80 + <Unit filename="src\lib3270\bounds.c">
81 81 <Option compilerVar="CC" />
82 82 </Unit>
83   - <Unit filename="src/lib3270/cg.h" />
84   - <Unit filename="src/lib3270/charset.c">
  83 + <Unit filename="src\lib3270\cg.h" />
  84 + <Unit filename="src\lib3270\charset.c">
85 85 <Option compilerVar="CC" />
86 86 </Unit>
87   - <Unit filename="src/lib3270/charsetc.h" />
88   - <Unit filename="src/lib3270/childc.h" />
89   - <Unit filename="src/lib3270/ctlr.c">
  87 + <Unit filename="src\lib3270\charsetc.h" />
  88 + <Unit filename="src\lib3270\childc.h" />
  89 + <Unit filename="src\lib3270\ctlr.c">
90 90 <Option compilerVar="CC" />
91 91 </Unit>
92   - <Unit filename="src/lib3270/ctlrc.h" />
93   - <Unit filename="src/lib3270/ft.c">
  92 + <Unit filename="src\lib3270\ctlrc.h" />
  93 + <Unit filename="src\lib3270\ft.c">
94 94 <Option compilerVar="CC" />
95 95 </Unit>
96   - <Unit filename="src/lib3270/ft_cut.c">
  96 + <Unit filename="src\lib3270\ft_cut.c">
97 97 <Option compilerVar="CC" />
98 98 </Unit>
99   - <Unit filename="src/lib3270/ft_cut_ds.h" />
100   - <Unit filename="src/lib3270/ft_cutc.h" />
101   - <Unit filename="src/lib3270/ft_dft.c">
  99 + <Unit filename="src\lib3270\ft_cut_ds.h" />
  100 + <Unit filename="src\lib3270\ft_cutc.h" />
  101 + <Unit filename="src\lib3270\ft_dft.c">
102 102 <Option compilerVar="CC" />
103 103 </Unit>
104   - <Unit filename="src/lib3270/ft_dft_ds.h" />
105   - <Unit filename="src/lib3270/ft_dftc.h" />
106   - <Unit filename="src/lib3270/ftc.h" />
107   - <Unit filename="src/lib3270/globals.h" />
108   - <Unit filename="src/lib3270/glue.c">
  104 + <Unit filename="src\lib3270\ft_dft_ds.h" />
  105 + <Unit filename="src\lib3270\ft_dftc.h" />
  106 + <Unit filename="src\lib3270\ftc.h" />
  107 + <Unit filename="src\lib3270\globals.h" />
  108 + <Unit filename="src\lib3270\glue.c">
109 109 <Option compilerVar="CC" />
110 110 </Unit>
111   - <Unit filename="src/lib3270/gluec.h" />
112   - <Unit filename="src/lib3270/host.c">
  111 + <Unit filename="src\lib3270\gluec.h" />
  112 + <Unit filename="src\lib3270\host.c">
113 113 <Option compilerVar="CC" />
114 114 </Unit>
115   - <Unit filename="src/lib3270/hostc.h" />
116   - <Unit filename="src/lib3270/html.c">
  115 + <Unit filename="src\lib3270\hostc.h" />
  116 + <Unit filename="src\lib3270\html.c">
117 117 <Option compilerVar="CC" />
118 118 </Unit>
119   - <Unit filename="src/lib3270/icmdc.h" />
120   - <Unit filename="src/lib3270/iocalls.c">
  119 + <Unit filename="src\lib3270\icmdc.h" />
  120 + <Unit filename="src\lib3270\iocalls.c">
121 121 <Option compilerVar="CC" />
122 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 125 <Option compilerVar="CC" />
126 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 130 <Option compilerVar="CC" />
131 131 </Unit>
132   - <Unit filename="src/lib3270/macros.c">
  132 + <Unit filename="src\lib3270\macros.c">
133 133 <Option compilerVar="CC" />
134 134 </Unit>
135   - <Unit filename="src/lib3270/mkfb.c">
  135 + <Unit filename="src\lib3270\mkfb.c">
136 136 <Option compilerVar="CC" />
137 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 140 <Option compilerVar="CC" />
141 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 146 <Option compilerVar="CC" />
147 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 150 <Option compilerVar="CC" />
151 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 154 <Option compilerVar="CC" />
155 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 158 <Option compilerVar="CC" />
159 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 162 <Option compilerVar="CC" />
163 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 168 <Option compilerVar="CC" />
169 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 172 <Option compilerVar="CC" />
173 173 </Unit>
174   - <Unit filename="src/lib3270/session.c">
  174 + <Unit filename="src\lib3270\session.c">
175 175 <Option compilerVar="CC" />
176 176 </Unit>
177   - <Unit filename="src/lib3270/sf.c">
  177 + <Unit filename="src\lib3270\sf.c">
178 178 <Option compilerVar="CC" />
179 179 </Unit>
180   - <Unit filename="src/lib3270/sf.h" />
181   - <Unit filename="src/lib3270/shlobj_missing.h" />
182   - <Unit filename="src/lib3270/sources.mak" />
183   - <Unit filename="src/lib3270/state.c">
  180 + <Unit filename="src\lib3270\sf.h" />
  181 + <Unit filename="src\lib3270\shlobj_missing.h" />
  182 + <Unit filename="src\lib3270\sources.mak" />
  183 + <Unit filename="src\lib3270\state.c">
184 184 <Option compilerVar="CC" />
185 185 </Unit>
186   - <Unit filename="src/lib3270/statusc.h" />
187   - <Unit filename="src/lib3270/tables.c">
  186 + <Unit filename="src\lib3270\statusc.h" />
  187 + <Unit filename="src\lib3270\tables.c">
188 188 <Option compilerVar="CC" />
189 189 </Unit>
190   - <Unit filename="src/lib3270/tablesc.h" />
191   - <Unit filename="src/lib3270/telnet.c">
  190 + <Unit filename="src\lib3270\tablesc.h" />
  191 + <Unit filename="src\lib3270\telnet.c">
192 192 <Option compilerVar="CC" />
193 193 </Unit>
194   - <Unit filename="src/lib3270/telnetc.h" />
195   - <Unit filename="src/lib3270/testprogram.c">
  194 + <Unit filename="src\lib3270\telnetc.h" />
  195 + <Unit filename="src\lib3270\testprogram.c">
196 196 <Option compilerVar="CC" />
197 197 </Unit>
198   - <Unit filename="src/lib3270/tn3270e.h" />
199   - <Unit filename="src/lib3270/toggle.h" />
200   - <Unit filename="src/lib3270/toggles.c">
  198 + <Unit filename="src\lib3270\tn3270e.h" />
  199 + <Unit filename="src\lib3270\toggle.h" />
  200 + <Unit filename="src\lib3270\toggles.c">
201 201 <Option compilerVar="CC" />
202 202 </Unit>
203   - <Unit filename="src/lib3270/togglesc.h" />
204   - <Unit filename="src/lib3270/trace_ds.c">
  203 + <Unit filename="src\lib3270\togglesc.h" />
  204 + <Unit filename="src\lib3270\trace_ds.c">
205 205 <Option compilerVar="CC" />
206 206 </Unit>
207   - <Unit filename="src/lib3270/trace_dsc.h" />
208   - <Unit filename="src/lib3270/utf8.c">
  207 + <Unit filename="src\lib3270\trace_dsc.h" />
  208 + <Unit filename="src\lib3270\utf8.c">
209 209 <Option compilerVar="CC" />
210 210 </Unit>
211   - <Unit filename="src/lib3270/utf8c.h" />
212   - <Unit filename="src/lib3270/util.c">
  211 + <Unit filename="src\lib3270\utf8c.h" />
  212 + <Unit filename="src\lib3270\util.c">
213 213 <Option compilerVar="CC" />
214 214 </Unit>
215   - <Unit filename="src/lib3270/utilc.h" />
216   - <Unit filename="src/lib3270/w3miscc.h" />
217   - <Unit filename="src/lib3270/widec.h" />
218   - <Unit filename="src/lib3270/winversc.h" />
219   - <Unit filename="src/lib3270/xioc.h" />
220   - <Unit filename="src/lib3270/xl.h" />
221   - <Unit filename="src/pw3270/Makefile.in" />
222   - <Unit filename="src/pw3270/actions.c">
  215 + <Unit filename="src\lib3270\utilc.h" />
  216 + <Unit filename="src\lib3270\w3miscc.h" />
  217 + <Unit filename="src\lib3270\widec.h" />
  218 + <Unit filename="src\lib3270\winversc.h" />
  219 + <Unit filename="src\lib3270\xioc.h" />
  220 + <Unit filename="src\lib3270\xl.h" />
  221 + <Unit filename="src\pw3270\Makefile.in" />
  222 + <Unit filename="src\pw3270\actions.c">
223 223 <Option compilerVar="CC" />
224 224 </Unit>
225   - <Unit filename="src/pw3270/colors.c">
  225 + <Unit filename="src\pw3270\colors.c">
226 226 <Option compilerVar="CC" />
227 227 </Unit>
228   - <Unit filename="src/pw3270/common/common.h.in" />
229   - <Unit filename="src/pw3270/common/config.c">
  228 + <Unit filename="src\pw3270\common\common.h.in" />
  229 + <Unit filename="src\pw3270\common\config.c">
230 230 <Option compilerVar="CC" />
231 231 </Unit>
232   - <Unit filename="src/pw3270/common/sources.mak" />
233   - <Unit filename="src/pw3270/dialog.c">
  232 + <Unit filename="src\pw3270\common\sources.mak" />
  233 + <Unit filename="src\pw3270\dialog.c">
234 234 <Option compilerVar="CC" />
235 235 </Unit>
236   - <Unit filename="src/pw3270/filetransfer.c">
  236 + <Unit filename="src\pw3270\filetransfer.c">
237 237 <Option compilerVar="CC" />
238 238 </Unit>
239   - <Unit filename="src/pw3270/filetransfer.h" />
240   - <Unit filename="src/pw3270/fonts.c">
  239 + <Unit filename="src\pw3270\filetransfer.h" />
  240 + <Unit filename="src\pw3270\fonts.c">
241 241 <Option compilerVar="CC" />
242 242 </Unit>
243   - <Unit filename="src/pw3270/globals.h" />
244   - <Unit filename="src/pw3270/main.c">
  243 + <Unit filename="src\pw3270\globals.h" />
  244 + <Unit filename="src\pw3270\main.c">
245 245 <Option compilerVar="CC" />
246 246 </Unit>
247   - <Unit filename="src/pw3270/print.c">
  247 + <Unit filename="src\pw3270\print.c">
248 248 <Option compilerVar="CC" />
249 249 </Unit>
250   - <Unit filename="src/pw3270/uiparser/Makefile.in" />
251   - <Unit filename="src/pw3270/uiparser/accelerator.c">
  250 + <Unit filename="src\pw3270\uiparser\Makefile.in" />
  251 + <Unit filename="src\pw3270\uiparser\accelerator.c">
252 252 <Option compilerVar="CC" />
253 253 </Unit>
254   - <Unit filename="src/pw3270/uiparser/action.c">
  254 + <Unit filename="src\pw3270\uiparser\action.c">
255 255 <Option compilerVar="CC" />
256 256 </Unit>
257   - <Unit filename="src/pw3270/uiparser/menu.c">
  257 + <Unit filename="src\pw3270\uiparser\menu.c">
258 258 <Option compilerVar="CC" />
259 259 </Unit>
260   - <Unit filename="src/pw3270/uiparser/menubar.c">
  260 + <Unit filename="src\pw3270\uiparser\menubar.c">
261 261 <Option compilerVar="CC" />
262 262 </Unit>
263   - <Unit filename="src/pw3270/uiparser/menuitem.c">
  263 + <Unit filename="src\pw3270\uiparser\menuitem.c">
264 264 <Option compilerVar="CC" />
265 265 </Unit>
266   - <Unit filename="src/pw3270/uiparser/parsefile.c">
  266 + <Unit filename="src\pw3270\uiparser\parsefile.c">
267 267 <Option compilerVar="CC" />
268 268 </Unit>
269   - <Unit filename="src/pw3270/uiparser/parser.c">
  269 + <Unit filename="src\pw3270\uiparser\parser.c">
270 270 <Option compilerVar="CC" />
271 271 </Unit>
272   - <Unit filename="src/pw3270/uiparser/parser.h" />
273   - <Unit filename="src/pw3270/uiparser/popup.c">
  272 + <Unit filename="src\pw3270\uiparser\parser.h" />
  273 + <Unit filename="src\pw3270\uiparser\popup.c">
274 274 <Option compilerVar="CC" />
275 275 </Unit>
276   - <Unit filename="src/pw3270/uiparser/private.h" />
277   - <Unit filename="src/pw3270/uiparser/script.c">
  276 + <Unit filename="src\pw3270\uiparser\private.h" />
  277 + <Unit filename="src\pw3270\uiparser\script.c">
278 278 <Option compilerVar="CC" />
279 279 </Unit>
280   - <Unit filename="src/pw3270/uiparser/separator.c">
  280 + <Unit filename="src\pw3270\uiparser\separator.c">
281 281 <Option compilerVar="CC" />
282 282 </Unit>
283   - <Unit filename="src/pw3270/uiparser/sources.mak" />
284   - <Unit filename="src/pw3270/uiparser/toolbar.c">
  283 + <Unit filename="src\pw3270\uiparser\sources.mak" />
  284 + <Unit filename="src\pw3270\uiparser\toolbar.c">
285 285 <Option compilerVar="CC" />
286 286 </Unit>
287   - <Unit filename="src/pw3270/uiparser/toolitem.c">
  287 + <Unit filename="src\pw3270\uiparser\toolitem.c">
288 288 <Option compilerVar="CC" />
289 289 </Unit>
290   - <Unit filename="src/pw3270/v3270/accessible.c">
  290 + <Unit filename="src\pw3270\v3270\accessible.c">
291 291 <Option compilerVar="CC" />
292 292 </Unit>
293   - <Unit filename="src/pw3270/v3270/accessible.h" />
294   - <Unit filename="src/pw3270/v3270/draw.c">
  293 + <Unit filename="src\pw3270\v3270\accessible.h" />
  294 + <Unit filename="src\pw3270\v3270\draw.c">
295 295 <Option compilerVar="CC" />
296 296 </Unit>
297   - <Unit filename="src/pw3270/v3270/genmarshal" />
298   - <Unit filename="src/pw3270/v3270/iocallback.c">
  297 + <Unit filename="src\pw3270\v3270\genmarshal" />
  298 + <Unit filename="src\pw3270\v3270\iocallback.c">
299 299 <Option compilerVar="CC" />
300 300 </Unit>
301   - <Unit filename="src/pw3270/v3270/keyboard.c">
  301 + <Unit filename="src\pw3270\v3270\keyboard.c">
302 302 <Option compilerVar="CC" />
303 303 </Unit>
304   - <Unit filename="src/pw3270/v3270/mouse.c">
  304 + <Unit filename="src\pw3270\v3270\mouse.c">
305 305 <Option compilerVar="CC" />
306 306 </Unit>
307   - <Unit filename="src/pw3270/v3270/oia.c">
  307 + <Unit filename="src\pw3270\v3270\oia.c">
308 308 <Option compilerVar="CC" />
309 309 </Unit>
310   - <Unit filename="src/pw3270/v3270/private.h" />
311   - <Unit filename="src/pw3270/v3270/selection.c">
  310 + <Unit filename="src\pw3270\v3270\private.h" />
  311 + <Unit filename="src\pw3270\v3270\selection.c">
312 312 <Option compilerVar="CC" />
313 313 </Unit>
314   - <Unit filename="src/pw3270/v3270/sources.mak" />
315   - <Unit filename="src/pw3270/v3270/widget.c">
  314 + <Unit filename="src\pw3270\v3270\sources.mak" />
  315 + <Unit filename="src\pw3270\v3270\widget.c">
316 316 <Option compilerVar="CC" />
317 317 </Unit>
318   - <Unit filename="src/pw3270/window.c">
  318 + <Unit filename="src\pw3270\window.c">
319 319 <Option compilerVar="CC" />
320 320 </Unit>
321   - <Unit filename="src/tools/Makefile.in" />
322   - <Unit filename="ui/00default.xml" />
323   - <Unit filename="ui/99debug.xml" />
  321 + <Unit filename="src\tools\Makefile.in" />
  322 + <Unit filename="ui\00default.xml" />
  323 + <Unit filename="ui\99debug.xml" />
  324 + <Unit filename="updateChangeLog.sh" />
324 325 <Extensions>
325 326 <code_completion />
326 327 <debugger />
... ...
src/lib3270/ft_cut.c
  Diff comments   View file @a9a8902
... ... @@ -150,7 +150,7 @@ upload_convert(unsigned char *buf, int len)
150 150 unsigned char c = *buf++;
151 151 char *ixp;
152 152 int ix;
153   - int oq = -1;
  153 + // int oq = -1;
154 154  
155 155 retry:
156 156 if (quadrant < 0) {
... ... @@ -176,7 +176,7 @@ upload_convert(unsigned char *buf, int len)
176 176 ixp = strchr(alphas, ebc2asc[c]);
177 177 if (ixp == (char *)NULL) {
178 178 /* Try a different quadrant. */
179   - oq = quadrant;
  179 + // oq = quadrant;
180 180 quadrant = -1;
181 181 goto retry;
182 182 }
... ... @@ -189,7 +189,7 @@ upload_convert(unsigned char *buf, int len)
189 189 if (quadrant != OTHER_2 && c != XLATE_NULL &&
190 190 !conv[quadrant].xlate[ix]) {
191 191 /* Try a different quadrant. */
192   - oq = quadrant;
  192 +// oq = quadrant;
193 193 quadrant = -1;
194 194 goto retry;
195 195 }
... ...
src/lib3270/globals.h
  Diff comments   View file @a9a8902
... ... @@ -349,7 +349,7 @@ LIB3270_INTERNAL void key_ACharacter(unsigned char c, enum keytype keytype, enum
349 349 LIB3270_INTERNAL void lib3270_initialize(void);
350 350 LIB3270_INTERNAL int cursor_move(H3270 *session, int baddr);
351 351  
352   -LIB3270_INTERNAL void add_input_calls(H3270 *, void (*)(H3270 *), void (*)(H3270 *));
  352 +// LIB3270_INTERNAL void add_input_calls(H3270 *, void (*)(H3270 *), void (*)(H3270 *));
353 353  
354 354 LIB3270_INTERNAL void toggle_rectselect(H3270 *session, struct lib3270_toggle *t, LIB3270_TOGGLE_TYPE tt);
355 355  
... ...
src/lib3270/host.c
  Diff comments   View file @a9a8902
... ... @@ -567,7 +567,18 @@ static int do_connect(H3270 *hSession, const char *n)
567 567 /* Success. */
568 568  
569 569 /* Setup socket I/O. */
570   - add_input_calls(hSession,net_input,net_exception);
  570 +// add_input_calls(hSession,net_input,net_exception);
  571 +#ifdef _WIN32
  572 + hSession->ns_exception_id = AddExcept((int) hSession->sockEvent, hSession, net_exception);
  573 + hSession->ns_read_id = AddInput((int) hSession->sockEvent, hSession, net_input);
  574 +#else
  575 + hSession->ns_exception_id = AddExcept(hSession->sock, hSession, net_exception);
  576 + hSession->ns_read_id = AddInput(hSession->sock, hSession, net_input);
  577 +#endif // WIN32
  578 +
  579 + hSession->excepting = 1;
  580 + hSession->reading = 1;
  581 +
571 582  
572 583 /* Set state and tell the world. */
573 584 if (pending)
... ...
src/lib3270/html.c
  Diff comments   View file @a9a8902
... ... @@ -115,7 +115,7 @@
115 115 append_string(info,element_text[id]);
116 116 }
117 117  
118   - static update_colors(struct html_info *info, unsigned short attr)
  118 + static void update_colors(struct html_info *info, unsigned short attr)
119 119 {
120 120 unsigned short fg;
121 121 unsigned short bg = ((attr & 0x00F0) >> 4);
... ... @@ -141,7 +141,7 @@
141 141 info->bg = bg;
142 142 }
143 143  
144   - static const append_char(struct html_info *info, const struct chr_xlat *xlat, unsigned char chr)
  144 + static void append_char(struct html_info *info, const struct chr_xlat *xlat, unsigned char chr)
145 145 {
146 146 char txt[] = { chr, 0 };
147 147 int f;
... ...
src/lib3270/iocalls.c
  Diff comments   View file @a9a8902
... ... @@ -582,6 +582,7 @@ void x_except_on(H3270 *h)
582 582 #endif // WIN32
583 583 }
584 584  
  585 +/*
585 586 void add_input_calls(H3270 *session, void (*in)(H3270 *session), void (*exc)(H3270 *session))
586 587 {
587 588 #ifdef _WIN32
... ... @@ -592,9 +593,10 @@ void add_input_calls(H3270 *session, void (*in)(H3270 *session), void (*exc)(H32
592 593 session->ns_read_id = AddInput(session->sock, session, in);
593 594 #endif // WIN32
594 595  
595   - session->excepting = 1;
  596 + session->excepting = 1;
596 597 session->reading = 1;
597 598 }
  599 +*/
598 600  
599 601 void remove_input_calls(H3270 *session)
600 602 {
... ...
src/lib3270/proxy.c
  Diff comments   View file @a9a8902
... ... @@ -18,7 +18,7 @@
18 18 * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
19 19 * St, Fifth Floor, Boston, MA 02110-1301 USA
20 20 *
21   - * Este programa está nomeado como proxy.c e possui 991 linhas de código.
  21 + * Este programa está nomeado como proxy.c e possui - linhas de código.
22 22 *
23 23 * Contatos:
24 24 *
... ... @@ -42,6 +42,7 @@
42 42 #endif // _WIN32
43 43  
44 44 #include "globals.h"
  45 +#include "utilc.h"
45 46  
46 47 //#include "appres.h"
47 48 #include "resources.h"
... ... @@ -51,9 +52,8 @@
51 52 #endif
52 53  
53 54 #if defined(_WIN32)
54   -
55 55 #include <ws2tcpip.h>
56   -
  56 + #include "w3miscc.h"
57 57 #else
58 58  
59 59 #include <sys/socket.h>
... ... @@ -824,8 +824,7 @@ proxy_socks5(int fd, char *host, unsigned short port, int force_d)
824 824 *s++ = 0x04; /* IPv6 */
825 825 memcpy(s, &ha.sin6.sin6_addr, sizeof(struct in6_addr));
826 826 s += sizeof(struct in6_addr);
827   - (void) inet_ntop(AF_INET6, &ha.sin6.sin6_addr, nbuf,
828   - sizeof(nbuf));
  827 + (void) inet_ntop(AF_INET6, &ha.sin6.sin6_addr, nbuf, sizeof(nbuf));
829 828 #endif /*]*/
830 829 }
831 830 SET16(s, port);
... ...
src/lib3270/screen.c
  Diff comments   View file @a9a8902
... ... @@ -50,7 +50,7 @@
50 50 #include "tablesc.h"
51 51 #include "trace_dsc.h"
52 52 #include "utilc.h"
53   -#include "w3miscc.h"
  53 +// #include "w3miscc.h"
54 54 #include "widec.h"
55 55 #include "xioc.h"
56 56 #include "screen.h"
... ...
src/lib3270/telnet.c
  Diff comments   View file @a9a8902
... ... @@ -217,7 +217,7 @@ static void net_connected(H3270 *session);
217 217 #if defined(X3270_TN3270E) /*[*/
218 218 static int tn3270e_negotiate(H3270 *hSession);
219 219 #endif /*]*/
220   -static int process_eor(void);
  220 +static int process_eor(H3270 *hSession);
221 221 #if defined(X3270_TN3270E) /*[*/
222 222 #if defined(X3270_TRACE) /*[*/
223 223 static const char *tn3270e_function_names(const unsigned char *, int);
... ... @@ -746,7 +746,7 @@ int net_connect(H3270 *session, const char *host, char *portname, Boolean ls, Bo
746 746 _exit(1);
747 747 }
748 748  
749   - trace("Socket: %d Event: %ld",session->sock,session->sockEvent);
  749 +// trace("Socket: %d Event: %ld",session->sock,(unsigned long) session->sockEvent);
750 750  
751 751 #endif // WIN32
752 752  
... ... @@ -1260,7 +1260,7 @@ static int telnet_fsm(H3270 *session, unsigned char c)
1260 1260 case EOR: /* eor, process accumulated input */
1261 1261 if (IN_3270 || (IN_E && session->tn3270e_negotiated)) {
1262 1262 session->ns_rrcvd++;
1263   - if (process_eor())
  1263 + if (process_eor(session))
1264 1264 return -1;
1265 1265 } else
1266 1266 Warning(session, _( "EOR received when not in 3270 mode, ignored." ));
... ... @@ -1862,14 +1862,14 @@ static void process_bind(H3270 *hSession, unsigned char *buf, int buflen)
1862 1862 #endif /*]*/
1863 1863  
1864 1864 static int
1865   -process_eor(void)
  1865 +process_eor(H3270 *hSession)
1866 1866 {
1867   - if (h3270.syncing || !(h3270.ibptr - h3270.ibuf))
  1867 + if (hSession->syncing || !(hSession->ibptr - hSession->ibuf))
1868 1868 return(0);
1869 1869  
1870 1870 #if defined(X3270_TN3270E) /*[*/
1871 1871 if (IN_E) {
1872   - tn3270e_header *h = (tn3270e_header *) h3270.ibuf;
  1872 + tn3270e_header *h = (tn3270e_header *) hSession->ibuf;
1873 1873 unsigned char *s;
1874 1874 enum pds rv;
1875 1875  
... ... @@ -1881,52 +1881,52 @@ process_eor(void)
1881 1881  
1882 1882 switch (h->data_type) {
1883 1883 case TN3270E_DT_3270_DATA:
1884   - if ((h3270.e_funcs & E_OPT(TN3270E_FUNC_BIND_IMAGE)) &&
1885   - !h3270.tn3270e_bound)
  1884 + if ((hSession->e_funcs & E_OPT(TN3270E_FUNC_BIND_IMAGE)) &&
  1885 + !hSession->tn3270e_bound)
1886 1886 return 0;
1887   - h3270.tn3270e_submode = E_3270;
1888   - check_in3270(&h3270);
1889   - h3270.response_required = h->response_flag;
1890   - rv = process_ds(h3270.ibuf + EH_SIZE,
1891   - (h3270.ibptr - h3270.ibuf) - EH_SIZE);
  1887 + hSession->tn3270e_submode = E_3270;
  1888 + check_in3270(hSession);
  1889 + hSession->response_required = h->response_flag;
  1890 + rv = process_ds(hSession->ibuf + EH_SIZE,
  1891 + (hSession->ibptr - hSession->ibuf) - EH_SIZE);
1892 1892 if (rv < 0 &&
1893   - h3270.response_required != TN3270E_RSF_NO_RESPONSE)
1894   - tn3270e_nak(&h3270,rv);
  1893 + hSession->response_required != TN3270E_RSF_NO_RESPONSE)
  1894 + tn3270e_nak(hSession,rv);
1895 1895 else if (rv == PDS_OKAY_NO_OUTPUT &&
1896   - h3270.response_required == TN3270E_RSF_ALWAYS_RESPONSE)
1897   - tn3270e_ack(&h3270);
1898   - h3270.response_required = TN3270E_RSF_NO_RESPONSE;
  1896 + hSession->response_required == TN3270E_RSF_ALWAYS_RESPONSE)
  1897 + tn3270e_ack(hSession);
  1898 + hSession->response_required = TN3270E_RSF_NO_RESPONSE;
1899 1899 return 0;
1900 1900 case TN3270E_DT_BIND_IMAGE:
1901   - if (!(h3270.e_funcs & E_OPT(TN3270E_FUNC_BIND_IMAGE)))
  1901 + if (!(hSession->e_funcs & E_OPT(TN3270E_FUNC_BIND_IMAGE)))
1902 1902 return 0;
1903   - process_bind(&h3270, h3270.ibuf + EH_SIZE, (h3270.ibptr - h3270.ibuf) - EH_SIZE);
1904   - trace_dsn("< BIND PLU-name '%s'\n", h3270.plu_name);
1905   - h3270.tn3270e_bound = 1;
1906   - check_in3270(&h3270);
  1903 + process_bind(hSession, hSession->ibuf + EH_SIZE, (hSession->ibptr - hSession->ibuf) - EH_SIZE);
  1904 + trace_dsn("< BIND PLU-name '%s'\n", hSession->plu_name);
  1905 + hSession->tn3270e_bound = 1;
  1906 + check_in3270(hSession);
1907 1907 return 0;
1908 1908 case TN3270E_DT_UNBIND:
1909   - if (!(h3270.e_funcs & E_OPT(TN3270E_FUNC_BIND_IMAGE)))
  1909 + if (!(hSession->e_funcs & E_OPT(TN3270E_FUNC_BIND_IMAGE)))
1910 1910 return 0;
1911   - h3270.tn3270e_bound = 0;
1912   - if (h3270.tn3270e_submode == E_3270)
1913   - h3270.tn3270e_submode = E_NONE;
1914   - check_in3270(&h3270);
  1911 + hSession->tn3270e_bound = 0;
  1912 + if (hSession->tn3270e_submode == E_3270)
  1913 + hSession->tn3270e_submode = E_NONE;
  1914 + check_in3270(hSession);
1915 1915 return 0;
1916 1916 case TN3270E_DT_NVT_DATA:
1917 1917 /* In tn3270e NVT mode */
1918   - h3270.tn3270e_submode = E_NVT;
1919   - check_in3270(&h3270);
1920   - for (s = h3270.ibuf; s < h3270.ibptr; s++) {
  1918 + hSession->tn3270e_submode = E_NVT;
  1919 + check_in3270(hSession);
  1920 + for (s = hSession->ibuf; s < hSession->ibptr; s++) {
1921 1921 ansi_process(*s++);
1922 1922 }
1923 1923 return 0;
1924 1924 case TN3270E_DT_SSCP_LU_DATA:
1925   - if (!(h3270.e_funcs & E_OPT(TN3270E_FUNC_BIND_IMAGE)))
  1925 + if (!(hSession->e_funcs & E_OPT(TN3270E_FUNC_BIND_IMAGE)))
1926 1926 return 0;
1927   - h3270.tn3270e_submode = E_SSCP;
1928   - check_in3270(&h3270);
1929   - ctlr_write_sscp_lu(&h3270, h3270.ibuf + EH_SIZE,(h3270.ibptr - h3270.ibuf) - EH_SIZE);
  1927 + hSession->tn3270e_submode = E_SSCP;
  1928 + check_in3270(hSession);
  1929 + ctlr_write_sscp_lu(hSession, hSession->ibuf + EH_SIZE,(hSession->ibptr - hSession->ibuf) - EH_SIZE);
1930 1930 return 0;
1931 1931 default:
1932 1932 /* Should do something more extraordinary here. */
... ... @@ -1935,7 +1935,7 @@ process_eor(void)
1935 1935 } else
1936 1936 #endif /*]*/
1937 1937 {
1938   - (void) process_ds(h3270.ibuf, h3270.ibptr - h3270.ibuf);
  1938 + (void) process_ds(hSession->ibuf, hSession->ibptr - hSession->ibuf);
1939 1939 }
1940 1940 return 0;
1941 1941 }
... ...
src/lib3270/trace_ds.c
  Diff comments   View file @a9a8902
... ... @@ -68,7 +68,7 @@
68 68 #include "telnetc.h"
69 69 #include "trace_dsc.h"
70 70 #include "utilc.h"
71   -#include "w3miscc.h"
  71 +// #include "w3miscc.h"
72 72 #include "toggle.h"
73 73  
74 74 /* Maximum size of a tracefile header. */
... ...
src/lib3270/w3miscc.h
  Diff comments   View file @a9a8902
... ... @@ -16,12 +16,7 @@
16 16 * Miscellaneous Win32 functions.
17 17 */
18 18  
19   -#if defined(_WIN32) /*[*/
20   -
21   -#if defined(_WS2TCPIP_H) /*[*/
22   -LIB3270_INTERNAL const char *inet_ntop(int af, const void *src, char *dst,socklen_t cnt);
23   -#endif /*]*/
24   -
25   -LIB3270_INTERNAL const char *win32_strerror(int e);
26   -
27   -#endif /*]*/
  19 +#if defined(_WIN32)
  20 + LIB3270_INTERNAL const char *inet_ntop(int af, const void *src, char *dst,socklen_t cnt);
  21 + LIB3270_INTERNAL const char *win32_strerror(int e);
  22 +#endif
... ...
src/pw3270/common/config.c
  Diff comments   View file @a9a8902
... ... @@ -139,7 +139,7 @@ gchar * get_last_error_msg(void)
139 139 if(RegQueryValueExA(hKey,pName,NULL,&datatype,data,&datalen) == ERROR_SUCCESS)
140 140 {
141 141 data[datalen+1] = 0;
142   - cbk(pName,data,user_data);
  142 + cbk(pName,(const gchar *) data, user_data);
143 143 }
144 144 cName = MAX_KEY_LENGTH;
145 145 }
... ... @@ -169,7 +169,7 @@ gchar * get_last_error_msg(void)
169 169  
170 170 data[datalen] = 0;
171 171  
172   - * value = g_ascii_strtod(data, &end_of_valid_d);
  172 + * value = g_ascii_strtod((const gchar *) data, &end_of_valid_d);
173 173  
174 174 if(*end_of_valid_d != '\0' || end_of_valid_d == ((gchar *) data))
175 175 {
... ... @@ -347,7 +347,7 @@ gchar * get_last_error_msg(void)
347 347 if(RegQueryValueExA(key_handle,key,NULL,&datatype,data,&datalen) == ERROR_SUCCESS)
348 348 {
349 349 data[datalen+1] = 0;
350   - ret = g_strdup(data);
  350 + ret = g_strdup((const gchar *) data);
351 351 trace("datalen=%d",datalen);
352 352 }
353 353 else if(def)
... ...
src/pw3270/window.c
  Diff comments   View file @a9a8902
... ... @@ -150,7 +150,7 @@
150 150 static void pw3270_class_init(pw3270Class *klass)
151 151 {
152 152 // GObjectClass * gobject_class = G_OBJECT_CLASS(klass);
153   - GtkWidgetClass * widget_class = GTK_WIDGET_CLASS(klass);
  153 +// GtkWidgetClass * widget_class = GTK_WIDGET_CLASS(klass);
154 154  
155 155  
156 156 #if GTK_CHECK_VERSION(3,0,0)
... ...