From cba58e5910de1c31ccc0f99210688a4ef3228a8f Mon Sep 17 00:00:00 2001
From: "Kristofer.Pettersson@naruto." <>
Date: Fri, 2 Mar 2007 09:04:23 +0100
Subject: [PATCH] Merge BUG: Windows target won't compile.  - winsock2.h must
 be included before windows.h

---
 server-tools/instance-manager/WindowsService.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/server-tools/instance-manager/WindowsService.cpp b/server-tools/instance-manager/WindowsService.cpp
index 7c5641167e4..14795e2225a 100644
--- a/server-tools/instance-manager/WindowsService.cpp
+++ b/server-tools/instance-manager/WindowsService.cpp
@@ -13,9 +13,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
-#include <windows.h>
-
 #include "my_global.h"
+#include <windows.h>
 #include "WindowsService.h"
 
 static WindowsService *gService;