diff options
| author | Parth Chandra <pchandra@maprtech.com> | 2014-06-11 18:10:34 -0700 |
|---|---|---|
| committer | Jacques Nadeau <jacques@apache.org> | 2014-08-27 13:33:48 -0700 |
| commit | d944918ff8a1f76d9b4c400512a130bff7fb2c5f (patch) | |
| tree | 99ed4f6eae480a24d4f83121e4ff9793fae3cc56 /contrib/native/client/src/include | |
| parent | 5a7feb9dca73bc11249210e7a241a11533f6944e (diff) | |
DRILL-1021: Windows build
Diffstat (limited to 'contrib/native/client/src/include')
| -rw-r--r-- | contrib/native/client/src/include/drill/common.hpp | 8 |
1 files changed, 8 insertions, 0 deletions
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> |