Permalink
Browse files

source: fix compilation and linkage on Windows

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
  • Loading branch information...
1 parent 4022828 commit 001d0dd8d12a917bbc57d4aed32fadb4dc4851ea @tycho committed Jan 23, 2010
Showing with 11 additions and 1 deletion.
  1. +1 −0 source/compare.cpp
  2. +5 −1 source/console.cpp
  3. +2 −0 source/crisscross/universal_include.h
  4. +1 −0 source/string_utils.cpp
  5. +2 −0 source/tcpsocket.cpp
View
@@ -9,6 +9,7 @@
*
*/
+#include <crisscross/universal_include.h>
#include <crisscross/compare.h>
#include <cstring>
View
@@ -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;
@@ -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
View
@@ -9,6 +9,7 @@
*
*/
+#include <crisscross/universal_include.h>
#include <crisscross/string_utils.h>
#include <cstring>
View
@@ -33,6 +33,8 @@
#define INVALID_SOCKET -1
#define SOCKET_ERROR -1
#else
+#include <winsock2.h>
+#include <mstcpip.h>
typedef int socklen_t;
#endif

0 comments on commit 001d0dd

Please sign in to comment.