source: fix compilation and linkage on Windows

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
tycho · Jan 23, 2010 · 001d0dd · 001d0dd
1 parent 4022828
commit 001d0dd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/source/compare.cpp b/source/compare.cpp
@@ -9,6 +9,7 @@
  *
  */
 
+#include <crisscross/universal_include.h>
 #include <crisscross/compare.h>
 
 #include <cstring>

diff --git a/source/console.cpp b/source/console.cpp
@@ -11,7 +11,9 @@
 
 #include <crisscross/universal_include.h>
 
+#ifndef TARGET_OS_WINDOWS
 #include <pthread.h>
+#endif
 #include <cstdio>
 #include <cstring>
 
@@ -24,9 +26,11 @@
 #include <sys/ioctl.h>
 #endif
 #include <sys/wait.h>
-#include <fcntl.h>
 #include <signal.h>
+#else
+#include <io.h>
 #endif
+#include <fcntl.h>
 
 #if defined(TARGET_COMPILER_BORLAND)
 typedef long intptr_t;

diff --git a/source/crisscross/universal_include.h b/source/crisscross/universal_include.h
@@ -146,6 +146,8 @@
 #define _CRTDBG_MAP_ALLOC
 #endif
 #if defined (ENABLE_SYMBOL_ENGINE)
+#include <winsock2.h>
+#include <windows.h>
 #include <dbghelp.h>
 #pragma comment (lib, "dbghelp.lib")
 #endif

diff --git a/source/string_utils.cpp b/source/string_utils.cpp
@@ -9,6 +9,7 @@
  *
  */
 
+#include <crisscross/universal_include.h>
 #include <crisscross/string_utils.h>
 
 #include <cstring>

diff --git a/source/tcpsocket.cpp b/source/tcpsocket.cpp
@@ -33,6 +33,8 @@
 #define INVALID_SOCKET -1
 #define SOCKET_ERROR -1
 #else
+#include <winsock2.h>
+#include <mstcpip.h>
 typedef int socklen_t;
 #endif