summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Kivilinna <jussi.kivilinna@iki.fi>2013-06-26 15:28:49 +0300
committerJussi Kivilinna <jussi.kivilinna@iki.fi>2013-07-10 22:02:08 +0300
commitd6c9c86cb7f571ae0bd9aee4efa01a0f9c4c3104 (patch)
treec4a73a5f13f6a8052607fb6eff6105bae1088f10
parentc64a0dcbefc5b0055954e37a3c86b32ff7a1b1da (diff)
downloadlibgcrypt-d6c9c86cb7f571ae0bd9aee4efa01a0f9c4c3104.tar.gz
Fix 'Please include winsock2.h before windows.h' warnings with mingw32
* random/rndw32.c: include winsock2.h before windows.h. * src/ath.h [_WIN32]: Ditto. * tests/benchmark.c [_WIN32]: Ditto. -- Patch silences warnings of following type: /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/winsock2.h:15:2: warning: #warning Please include winsock2.h before windows.h [-Wcpp] Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
-rw-r--r--random/rndw32.c1
-rw-r--r--src/ath.h1
-rw-r--r--tests/benchmark.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/random/rndw32.c b/random/rndw32.c
index f8a83b60..5c5d6c68 100644
--- a/random/rndw32.c
+++ b/random/rndw32.c
@@ -78,6 +78,7 @@
#include <stdint.h>
#endif
+#include <winsock2.h>
#include <windows.h>
diff --git a/src/ath.h b/src/ath.h
index 6ffa928e..a132e0b7 100644
--- a/src/ath.h
+++ b/src/ath.h
@@ -23,6 +23,7 @@
#include <config.h>
#ifdef _WIN32
+# include <winsock2.h>
# include <windows.h>
#else /* !_WIN32 */
# ifdef HAVE_SYS_SELECT_H
diff --git a/tests/benchmark.c b/tests/benchmark.c
index c4b52589..79048a3d 100644
--- a/tests/benchmark.c
+++ b/tests/benchmark.c
@@ -25,6 +25,7 @@
#include <time.h>
#include <stdarg.h>
#ifdef _WIN32
+#include <winsock2.h>
#include <windows.h>
#else
#include <sys/times.h>