Commit edea5c85 authored by captainwong's avatar captainwong

update

parent 1da70634
#include "Client.h" #include "Client.h"
#ifdef _WIN32
#include <WinSock2.h> #include <WinSock2.h>
#pragma comment(lib, "ws2_32.lib") #pragma comment(lib, "ws2_32.lib")
#else
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#endif
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
...@@ -26,9 +31,19 @@ namespace net { ...@@ -26,9 +31,19 @@ namespace net {
struct OneTimeIniter { struct OneTimeIniter {
OneTimeIniter() { OneTimeIniter() {
#ifdef _WIN32
WSADATA wsa_data;
WSAStartup(0x0201, &wsa_data);
if (0 != evthread_use_windows_threads()) { if (0 != evthread_use_windows_threads()) {
JLOG_CRTC("failed to init libevent with thread by calling evthread_use_windows_threads"); fprintf(stderr, "failed to init libevent with thread by calling evthread_use_windows_threads\n");
abort();
} }
#else
if (0 != evthread_use_pthreads()) {
fprintf(stderr, "failed to init libevent with thread by calling evthread_use_pthreads\n");
abort();
}
#endif
} }
}; };
......
...@@ -121,6 +121,7 @@ ...@@ -121,6 +121,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>$(DEVLIBS)\libevent-2.1.12-stable-install\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(DEVLIBS)\libevent-2.1.12-stable-install\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem> <SubSystem>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment