From d944918ff8a1f76d9b4c400512a130bff7fb2c5f Mon Sep 17 00:00:00 2001
From: Parth Chandra <pchandra@maprtech.com>
Date: Wed, 11 Jun 2014 18:10:34 -0700
Subject: DRILL-1021: Windows build

---
 contrib/native/client/src/include/drill/common.hpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'contrib/native/client/src/include')

diff --git a/contrib/native/client/src/include/drill/common.hpp b/contrib/native/client/src/include/drill/common.hpp
index 59734dc5b..dfb04e83f 100644
--- a/contrib/native/client/src/include/drill/common.hpp
+++ b/contrib/native/client/src/include/drill/common.hpp
@@ -20,6 +20,14 @@
 #ifndef _COMMON_H_
 #define _COMMON_H_
 
+#ifdef _WIN32
+// The order of inclusion is important. Including winsock2 before everything else
+// ensures that the correct typedefs are defined and that the older typedefs defined
+// in winsock and windows.h are not picked up.
+#include <winsock2.h>
+#include <windows.h>
+#endif
+
 #include <stdint.h>
 #include <string>
 #include <vector>
-- 
cgit v1.2.3