[PATCH] avoid accidental inclusion of old winsock.h

[Mark Brand]

>From 956504b76dc429de2459322bf799534a1171d953 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand at mabrand.nl>
Date: Mon, 3 Jun 2013 11:24:12 +0200
Subject: [PATCH] avoid accidental inclusion of old winsock.h

/src/gcrypt.h.in:# include <winsock2.h> implicitly includes
windows.h. Avoid including windows.h explicitly before
winsock2.h, to avoid implicit inclusion of conflicting winsock.h
from windows.h.

diff --git a/random/rndw32.c b/random/rndw32.c
index f8a83b6..d6c8e34 100644
--- a/random/rndw32.c
+++ b/random/rndw32.c
@@ -78,7 +78,6 @@
 #include <stdint.h>
 #endif
 
-#include <windows.h>
 
 
 #include "types.h"
diff --git a/src/ath.h b/src/ath.h
index 6ffa928..e52da11 100644
--- a/src/ath.h
+++ b/src/ath.h
@@ -23,7 +23,6 @@
 #include <config.h>
 
 #ifdef _WIN32
-# include <windows.h>
 #else /* !_WIN32 */
 # ifdef HAVE_SYS_SELECT_H
 #  include <sys/select.h>
diff --git a/tests/benchmark.c b/tests/benchmark.c
index 61badd5..8a9ceee 100644
--- a/tests/benchmark.c
+++ b/tests/benchmark.c
@@ -25,7 +25,6 @@
 #include <time.h>
 #include <stdarg.h>
 #ifdef _WIN32
-#include <windows.h>
 #else
 #include <sys/times.h>
 #endif
-- 
1.8.1.4