Commit 01e0b4b841969a2373264aeceb73008bb55b78bf
1 parent
ba8e4938
Exists in
master
and in
1 other branch
Fixing windows build.
Showing
2 changed files
with
5 additions
and
11 deletions
Show diff stats
src/terminal/drawing/draw.c
| @@ -27,13 +27,10 @@ | @@ -27,13 +27,10 @@ | ||
| 27 | * | 27 | * |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | - /* | ||
| 31 | #ifdef WIN32 | 30 | #ifdef WIN32 |
| 32 | #include <winsock2.h> | 31 | #include <winsock2.h> |
| 33 | #include <windows.h> | 32 | #include <windows.h> |
| 34 | - #include <ws2tcpip.h> | ||
| 35 | #endif // WIN32 | 33 | #endif // WIN32 |
| 36 | -*/ | ||
| 37 | 34 | ||
| 38 | #include <gtk/gtk.h> | 35 | #include <gtk/gtk.h> |
| 39 | #include <math.h> | 36 | #include <math.h> |
src/terminal/drawing/oia.c
| @@ -29,6 +29,11 @@ | @@ -29,6 +29,11 @@ | ||
| 29 | 29 | ||
| 30 | #include <config.h> | 30 | #include <config.h> |
| 31 | 31 | ||
| 32 | + #ifdef WIN32 | ||
| 33 | + #include <winsock2.h> | ||
| 34 | + #include <windows.h> | ||
| 35 | + #endif // WIN32 | ||
| 36 | + | ||
| 32 | #define ENABLE_NLS | 37 | #define ENABLE_NLS |
| 33 | #define GETTEXT_PACKAGE PACKAGE_NAME | 38 | #define GETTEXT_PACKAGE PACKAGE_NAME |
| 34 | 39 | ||
| @@ -36,14 +41,6 @@ | @@ -36,14 +41,6 @@ | ||
| 36 | #include <libintl.h> | 41 | #include <libintl.h> |
| 37 | #include <glib/gi18n.h> | 42 | #include <glib/gi18n.h> |
| 38 | 43 | ||
| 39 | - /* | ||
| 40 | - #ifdef WIN32 | ||
| 41 | - #include <winsock2.h> | ||
| 42 | - #include <windows.h> | ||
| 43 | - #include <ws2tcpip.h> | ||
| 44 | - #endif // WIN32 | ||
| 45 | - */ | ||
| 46 | - | ||
| 47 | #include <lib3270.h> | 44 | #include <lib3270.h> |
| 48 | #include <lib3270/session.h> | 45 | #include <lib3270/session.h> |
| 49 | #include <lib3270/log.h> | 46 | #include <lib3270/log.h> |