From 98ac8d1999a5723c83e9ef8938f6f38af658d7c5 Mon Sep 17 00:00:00 2001
From: Tomasz Kojm <tkojm@clamav.net>
Date: Wed, 13 Sep 2006 22:06:13 +0000
Subject: [PATCH] winsock.h must be included before clamav-config.h to compile
 with VS

git-svn: trunk@2254
---
 clamav-devel/clamd/clamd.c     | 8 ++++----
 clamav-devel/clamd/others.c    | 8 ++++----
 clamav-devel/clamd/scanner.c   | 8 ++++----
 clamav-devel/clamd/server-th.c | 8 ++++----
 clamav-devel/clamd/session.c   | 8 ++++----
 clamav-devel/clamd/tcpserver.c | 8 ++++----
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/clamav-devel/clamd/clamd.c b/clamav-devel/clamd/clamd.c
index d3a4b4580..23263f898 100644
--- a/clamav-devel/clamd/clamd.c
+++ b/clamav-devel/clamd/clamd.c
@@ -17,14 +17,14 @@
  *  MA 02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-#include "clamav-config.h"
-#endif
-
 #ifdef	_MSC_VER
 #include <winsock.h>
 #endif
 
+#if HAVE_CONFIG_H
+#include "clamav-config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/clamav-devel/clamd/others.c b/clamav-devel/clamd/others.c
index d6a0caa42..0957c2aef 100644
--- a/clamav-devel/clamd/others.c
+++ b/clamav-devel/clamd/others.c
@@ -17,14 +17,14 @@
  *  MA 02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-#include "clamav-config.h"
-#endif
-
 #ifdef	_MSC_VER
 #include <winsock.h>
 #endif
 
+#if HAVE_CONFIG_H
+#include "clamav-config.h"
+#endif
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/clamav-devel/clamd/scanner.c b/clamav-devel/clamd/scanner.c
index fec90c871..c28b89dad 100644
--- a/clamav-devel/clamd/scanner.c
+++ b/clamav-devel/clamd/scanner.c
@@ -17,14 +17,14 @@
  *  MA 02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-#include "clamav-config.h"
-#endif
-
 #ifdef	_MSC_VER
 #include <winsock.h>
 #endif
 
+#if HAVE_CONFIG_H
+#include "clamav-config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/clamav-devel/clamd/server-th.c b/clamav-devel/clamd/server-th.c
index ad1b90b95..27dab00db 100644
--- a/clamav-devel/clamd/server-th.c
+++ b/clamav-devel/clamd/server-th.c
@@ -18,14 +18,14 @@
  *  MA 02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-#include "clamav-config.h"
-#endif
-
 #ifdef	_MSC_VER
 #include <winsock.h>
 #endif
 
+#if HAVE_CONFIG_H
+#include "clamav-config.h"
+#endif
+
 #include <pthread.h>
 #include <errno.h>
 #include <signal.h>
diff --git a/clamav-devel/clamd/session.c b/clamav-devel/clamd/session.c
index ae1b84018..b34cb29c0 100644
--- a/clamav-devel/clamd/session.c
+++ b/clamav-devel/clamd/session.c
@@ -17,14 +17,14 @@
  *  MA 02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-#include "clamav-config.h"
-#endif
-
 #ifdef	_MSC_VER
 #include <winsock.h>
 #endif
 
+#if HAVE_CONFIG_H
+#include "clamav-config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/clamav-devel/clamd/tcpserver.c b/clamav-devel/clamd/tcpserver.c
index 0e36f2915..20d2b96d1 100644
--- a/clamav-devel/clamd/tcpserver.c
+++ b/clamav-devel/clamd/tcpserver.c
@@ -17,14 +17,14 @@
  *  MA 02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
-#include "clamav-config.h"
-#endif
-
 #ifdef	_MSC_VER
 #include <winsock.h>
 #endif
 
+#if HAVE_CONFIG_H
+#include "clamav-config.h"
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>