Download as
Browse Code »

Commit 0912371bf0a938a02e0120ed0a1f981a5e2adfb1

Authored by Perry Werneck
1 parent 8363ad93
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Corrigindo problemas encontrados ao compilar para windows depois da última atualização do MinGW

Showing 14 changed files with 74 additions and 5 deletions   Show diff stats
src/include/lib3270/session.h
  Diff comments   View file @0912371
... ... @@ -31,7 +31,14 @@
31 31  
32 32 #define LIB3270_SESSION_H_INCLUDED 1
33 33  
34   - #include <sys/socket.h>
  34 + #ifdef WIN32
  35 + #include <winsock2.h>
  36 + #include <windows.h>
  37 + #include <ws2tcpip.h>
  38 + #else
  39 + #include <sys/socket.h>
  40 + #endif // WIN32
  41 +
35 42 #include <lib3270/popup.h>
36 43  
37 44 struct lib3270_session_callbacks
... ...
src/lib3270/api.h
  Diff comments   View file @0912371
... ... @@ -32,6 +32,11 @@
32 32  
33 33 #ifndef LIB3270_API_INCLUDED
34 34  
  35 +#ifdef WIN32
  36 + #include <winsock2.h>
  37 + #include <windows.h>
  38 +#endif // WIN32
  39 +
35 40 #ifdef __cplusplus
36 41 extern "C" {
37 42 #endif
... ...
src/lib3270/ft.c
  Diff comments   View file @0912371
... ... @@ -29,6 +29,11 @@
29 29 *
30 30 */
31 31  
  32 +#ifdef WIN32
  33 + #include <winsock2.h>
  34 + #include <windows.h>
  35 +#endif // WIN32
  36 +
32 37 #include <lib3270/config.h>
33 38 #include <lib3270.h>
34 39 #include <lib3270/filetransfer.h>
... ...
src/lib3270/ft_dft.c
  Diff comments   View file @0912371
... ... @@ -34,6 +34,11 @@
34 34 * File transfer: DFT-style data processing functions
35 35 */
36 36  
  37 +#ifdef WIN32
  38 + #include <winsock2.h>
  39 + #include <windows.h>
  40 +#endif // WIN32
  41 +
37 42 #include <lib3270.h>
38 43 #include "private.h"
39 44  
... ...
src/lib3270/html.c
  Diff comments   View file @0912371
... ... @@ -25,12 +25,16 @@
25 25 * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
26 26 *
27 27 */
  28 +#ifdef WIN32
  29 + #include <winsock2.h>
  30 + #include <windows.h>
  31 +#endif // WIN32
28 32  
29 33 #include <string.h>
30 34 #include <stdlib.h>
31 35 #include <lib3270.h>
32 36 #include <lib3270/session.h>
33   -#include "3270ds.h"
  37 + #include "3270ds.h"
34 38 #include <lib3270/html.h>
35 39  
36 40 #include "private.h"
... ...
src/lib3270/log.c
  Diff comments   View file @0912371
... ... @@ -30,6 +30,11 @@
30 30 *
31 31 */
32 32  
  33 +#ifdef WIN32
  34 + #include <winsock2.h>
  35 + #include <windows.h>
  36 +#endif // WIN32
  37 +
33 38 #include <stdio.h>
34 39 #include <stdarg.h>
35 40 #include <lib3270/config.h>
... ...
src/lib3270/macros.c
  Diff comments   View file @0912371
... ... @@ -30,6 +30,11 @@
30 30 *
31 31 */
32 32  
  33 +#ifdef WIN32
  34 + #include <winsock2.h>
  35 + #include <windows.h>
  36 +#endif // WIN32
  37 +
33 38 #include <errno.h>
34 39 #include <string.h>
35 40 #include <stdio.h>
... ...
src/lib3270/private.h
  Diff comments   View file @0912371
... ... @@ -27,6 +27,11 @@
27 27 *
28 28 */
29 29  
  30 +#ifdef WIN32
  31 + #include <winsock2.h>
  32 + #include <windows.h>
  33 +#endif // WIN32
  34 +
30 35 /* Autoconf settings. */
31 36 #include <lib3270/config.h> /* autoconf settings */
32 37 #include <lib3270.h> /* lib3270 API calls and defs */
... ...
src/lib3270/toggles.c
  Diff comments   View file @0912371
... ... @@ -39,7 +39,11 @@
39 39 #include <errno.h>
40 40 #include <sys/types.h>
41 41  
42   -#ifndef WIN32
  42 +#ifdef WIN32
  43 + #include <winsock2.h>
  44 + #include <windows.h>
  45 + #include <ws2tcpip.h>
  46 +#else
43 47 #include <sys/socket.h>
44 48 #endif // !WIN32
45 49  
... ...
src/pw3270/v3270/draw.c
  Diff comments   View file @0912371
... ... @@ -27,6 +27,12 @@
27 27 *
28 28 */
29 29  
  30 +#ifdef WIN32
  31 + #include <winsock2.h>
  32 + #include <windows.h>
  33 + #include <ws2tcpip.h>
  34 +#endif // WIN32
  35 +
30 36 #include <gtk/gtk.h>
31 37 #include <math.h>
32 38 #include <pw3270.h>
... ...
src/pw3270/v3270/mouse.c
  Diff comments   View file @0912371
... ... @@ -98,7 +98,7 @@ static void button_1_press(GtkWidget *widget, GdkEventType type, int baddr)
98 98 break;
99 99  
100 100 case GDK_2BUTTON_PRESS: // Double click - Select word
101   - if(lib3270_select_word_at(GTK_V3270(widget)->host,baddr));
  101 + if(lib3270_select_word_at(GTK_V3270(widget)->host,baddr))
102 102 lib3270_ring_bell(GTK_V3270(widget)->host);
103 103 break;
104 104  
... ...
src/pw3270/v3270/oia.c
  Diff comments   View file @0912371
... ... @@ -27,6 +27,12 @@
27 27 *
28 28 */
29 29  
  30 +#ifdef WIN32
  31 + #include <winsock2.h>
  32 + #include <windows.h>
  33 + #include <ws2tcpip.h>
  34 +#endif // WIN32
  35 +
30 36 #include <pw3270.h>
31 37 #include <lib3270.h>
32 38 #include <lib3270/session.h>
... ...
src/pw3270/v3270/properties.c
  Diff comments   View file @0912371
... ... @@ -27,6 +27,12 @@
27 27 *
28 28 */
29 29  
  30 +#ifdef WIN32
  31 + #include <winsock2.h>
  32 + #include <windows.h>
  33 + #include <ws2tcpip.h>
  34 +#endif // WIN32
  35 +
30 36 #include <gtk/gtk.h>
31 37 #include <lib3270.h>
32 38 #include <lib3270/session.h>
... ...
src/pw3270/v3270/widget.c
  Diff comments   View file @0912371
... ... @@ -27,6 +27,12 @@
27 27 *
28 28 */
29 29  
  30 +#ifdef WIN32
  31 + #include <winsock2.h>
  32 + #include <windows.h>
  33 + #include <ws2tcpip.h>
  34 +#endif // WIN32
  35 +
30 36 #include <gtk/gtk.h>
31 37 #include <pw3270.h>
32 38 #include <lib3270.h>
... ... @@ -336,7 +342,7 @@ static void v3270_class_init(v3270Class *klass)
336 342 #ifdef WIN32
337 343 // http://git.gnome.org/browse/gtk+/tree/gdk/win32/gdkcursor-win32.c
338 344 // http://www.functionx.com/win32/Lesson02b.htm
339   - static const gchar * cr[V3270_CURSOR_COUNT] =
  345 + static const gchar * cr[LIB3270_POINTER_COUNT] =
340 346 {
341 347 "ibeam", // V3270_CURSOR_UNPROTECTED
342 348 "wait", // V3270_CURSOR_WAITING
... ...