diff options
| author | Werner Koch <[email protected]> | 2014-03-07 08:46:44 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-03-07 13:18:43 +0000 |
| commit | cb0dcc340836a64e2d33b27f1be7bc888c084f12 (patch) | |
| tree | b3a7c437ee7b2fe2f529697b458d3ea05d873bb0 /g10 | |
| parent | gl: Avoid warning about shadowing an arg. (diff) | |
| download | gnupg-cb0dcc340836a64e2d33b27f1be7bc888c084f12.tar.gz gnupg-cb0dcc340836a64e2d33b27f1be7bc888c084f12.zip | |
w32: Include winsock2.h to silence warnings.
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/exec.c | 5 | ||||
| -rw-r--r-- | g10/gpg.c | 5 | ||||
| -rw-r--r-- | g10/misc.c | 3 | ||||
| -rw-r--r-- | g10/photoid.c | 3 |
4 files changed, 14 insertions, 2 deletions
diff --git a/g10/exec.c b/g10/exec.c index 0caa43ba4..b0ff2eafe 100644 --- a/g10/exec.c +++ b/g10/exec.c @@ -33,7 +33,10 @@ #include <sys/wait.h> #endif #ifdef HAVE_DOSISH_SYSTEM -#include <windows.h> +# ifdef HAVE_WINSOCK2_H +# include <winsock2.h> +# endif +# include <windows.h> #endif #include <fcntl.h> #include <unistd.h> @@ -31,7 +31,10 @@ #endif #include <fcntl.h> #ifdef HAVE_W32_SYSTEM -#include <windows.h> +# ifdef HAVE_WINSOCK2_H +# include <winsock2.h> +# endif +# include <windows.h> #endif #define INCLUDED_BY_MAIN_MODULE 1 diff --git a/g10/misc.c b/g10/misc.c index 9c28e5b46..ba83b1910 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -41,6 +41,9 @@ #ifdef HAVE_W32_SYSTEM #include <time.h> #include <process.h> +#ifdef HAVE_WINSOCK2_H +# include <winsock2.h> +#endif #include <windows.h> #include <shlobj.h> #ifndef CSIDL_APPDATA diff --git a/g10/photoid.c b/g10/photoid.c index 132adca17..829d36c9e 100644 --- a/g10/photoid.c +++ b/g10/photoid.c @@ -22,6 +22,9 @@ #include <stdio.h> #include <string.h> #ifdef _WIN32 +# ifdef HAVE_WINSOCK2_H +# include <winsock2.h> +# endif # include <windows.h> # ifndef VER_PLATFORM_WIN32_WINDOWS # define VER_PLATFORM_WIN32_WINDOWS 1 |