summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorNicolas "Pixel" Noble <pixel@nobis-crew.org>2013-12-20 19:04:23 -0800
committerNicolas "Pixel" Noble <pixel@nobis-crew.org>2013-12-20 19:04:23 -0800
commit16594884da1c20c60fa1211c76939696547c02b5 (patch)
tree1e1ae20b323f6e99a36bcf9611032726c76afae6 /includes
parent3a91332a70abfc777a352c46727f54426c982371 (diff)
Sockets are now working properly under MSVC. I guess I broke mingw32 though, but we'll fix this later.
Diffstat (limited to 'includes')
-rw-r--r--includes/BString.h6
-rw-r--r--includes/Selectable.h3
2 files changed, 8 insertions, 1 deletions
diff --git a/includes/BString.h b/includes/BString.h
index 9f68e9a..a4178a4 100644
--- a/includes/BString.h
+++ b/includes/BString.h
@@ -13,7 +13,11 @@
#include <vector>
#ifdef _MSC_VER
-typedef size_t ssize_t;
+#ifdef _WIN64
+typedef __int64 ssize_t;
+#else /* _WIN64 */
+typedef _W64 int ssize_t;
+#endif /* _WIN64 */
#define printfwarning(a, b)
#else
#define printfwarning(a, b) __attribute__((format(printf, a, b)))
diff --git a/includes/Selectable.h b/includes/Selectable.h
index 0cfae0c..b3b5b8c 100644
--- a/includes/Selectable.h
+++ b/includes/Selectable.h
@@ -1,4 +1,7 @@
#pragma once
+#ifdef _WIN32
+#include <windows.h>
+#endif
#include <Handle.h>
#include <TaskMan.h>