summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNicolas "Pixel" Noble <pixel@nobis-crew.org>2013-12-22 15:47:07 -0800
committerNicolas "Pixel" Noble <pixel@nobis-crew.org>2013-12-22 15:47:07 -0800
commita12275a467c72ff429af64e477ba1e3bad3d6d79 (patch)
tree6d5f146a0a382426cb0db67909af77271f4022ba /src
parentb199455adeb01250743ba36e13d0905980326335 (diff)
parentdf8dd99434e5918a7506d888877d070356111d43 (diff)
Merge branch 'master' of ssh+git://git.grumpycoder.net/pub/repo.git/Balau
Diffstat (limited to 'src')
-rw-r--r--src/Selectable.cc3
-rw-r--r--src/Socket.cc4
2 files changed, 6 insertions, 1 deletions
diff --git a/src/Selectable.cc b/src/Selectable.cc
index 4213d34..de7d178 100644
--- a/src/Selectable.cc
+++ b/src/Selectable.cc
@@ -1,7 +1,8 @@
-#include <winsock2.h>
#include <sys/types.h>
#ifndef _MSC_VER
#include <unistd.h>
+#else
+#include <winsock2.h>
#endif
#ifdef _WIN32
#include <io.h>
diff --git a/src/Socket.cc b/src/Socket.cc
index 66dae18..e1778be 100644
--- a/src/Socket.cc
+++ b/src/Socket.cc
@@ -528,7 +528,11 @@ Balau::IO<Balau::Socket> Balau::Socket::accept() throw (GeneralException) {
} else {
Printer::elog(E_SOCKET, "Listener at %p got a new connection", this);
m_evtR->reset();
+#ifdef _MSC_VER
return IO<Socket>(new Socket(_open_osfhandle(s, 0)));
+#else
+ return IO<Socket>(new Socket(s));
+#endif
}
}
}