diff options
| author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2013-12-22 15:47:07 -0800 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2013-12-22 15:47:07 -0800 |
| commit | a12275a467c72ff429af64e477ba1e3bad3d6d79 (patch) | |
| tree | 6d5f146a0a382426cb0db67909af77271f4022ba | |
| parent | b199455adeb01250743ba36e13d0905980326335 (diff) | |
| parent | df8dd99434e5918a7506d888877d070356111d43 (diff) | |
Merge branch 'master' of ssh+git://git.grumpycoder.net/pub/repo.git/Balau
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/Selectable.cc | 3 | ||||
| -rw-r--r-- | src/Socket.cc | 4 |
3 files changed, 10 insertions, 1 deletions
@@ -63,6 +63,10 @@ HelperTasks.cc \ Http.cc \ HttpServer.cc \ SimpleMustache.cc \ +BWebSocket.cc \ +\ +SHA1.cc \ +Base64.cc \ \ BLua.cc \ LuaBigInt.cc \ 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 } } } |