hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Mac and Win support. I hate you, Mac and Win.

Browse source
This commit is contained in:
Thulinma 2014-01-08 16:32:43 +01:00
parent 983c03661d
commit 2b7b7e85ac
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/buffer/buffer.cpp
View file

@ -27,7 +27,7 @@ namespace Buffer {
///\brief A function running in a thread to send all statistics. ///\brief A function running in a thread to send all statistics.
///\param empty A null pointer. ///\param empty A null pointer.
void handleStats(void * empty){ void handleStats(void * empty){
#ifdef _TTHREAD_POSIX_ #if defined(_TTHREAD_POSIX_) && !(defined(__FreeBSD__) || defined(__APPLE__) || defined(__MACH__) || defined(_WIN32) || defined(__CYGWIN__))
pthread_setname_np(pthread_self(), "StatsHandler"); pthread_setname_np(pthread_self(), "StatsHandler");
#endif #endif
if (empty != 0){ if (empty != 0){
@ -55,7 +55,7 @@ namespace Buffer {
///\brief A function to handle input data. ///\brief A function to handle input data.
///\param conn A socket reference. ///\param conn A socket reference.
void handlePushIn(Socket::Connection & conn){ void handlePushIn(Socket::Connection & conn){
#ifdef _TTHREAD_POSIX_ #if defined(_TTHREAD_POSIX_) && !(defined(__FreeBSD__) || defined(__APPLE__) || defined(__MACH__) || defined(_WIN32) || defined(__CYGWIN__))
pthread_setname_np(pthread_self(), "Push Input"); pthread_setname_np(pthread_self(), "Push Input");
#endif #endif
conn.setBlocking(true); conn.setBlocking(true);
@ -80,7 +80,7 @@ namespace Buffer {
if (empty != 0){ if (empty != 0){
return; return;
} }
#ifdef _TTHREAD_POSIX_ #if defined(_TTHREAD_POSIX_) && !(defined(__FreeBSD__) || defined(__APPLE__) || defined(__MACH__) || defined(_WIN32) || defined(__CYGWIN__))
pthread_setname_np(pthread_self(), "Standard Input"); pthread_setname_np(pthread_self(), "Standard Input");
#endif #endif
long long int timeDiff = 0; //difference between local time and stream time long long int timeDiff = 0; //difference between local time and stream time
@ -120,7 +120,7 @@ namespace Buffer {
#if DEBUG >= 5 #if DEBUG >= 5
std::cerr << "Thread launched for user " << usr->sID << ", socket number " << usr->S.getSocket() << std::endl; std::cerr << "Thread launched for user " << usr->sID << ", socket number " << usr->S.getSocket() << std::endl;
#endif #endif
#ifdef _TTHREAD_POSIX_ #if defined(_TTHREAD_POSIX_) && !(defined(__FreeBSD__) || defined(__APPLE__) || defined(__MACH__) || defined(_WIN32) || defined(__CYGWIN__))
pthread_setname_np(pthread_self(), usr->sID.c_str()); pthread_setname_np(pthread_self(), usr->sID.c_str());
#endif #endif
usr->myRing = thisStream->getRing(); usr->myRing = thisStream->getRing();
@ -289,7 +289,7 @@ namespace Buffer {
} }
SS.setBlocking(false); SS.setBlocking(false);
conf.activate(); conf.activate();
#ifdef _TTHREAD_POSIX_ #if defined(_TTHREAD_POSIX_) && !(defined(__FreeBSD__) || defined(__APPLE__) || defined(__MACH__) || defined(_WIN32) || defined(__CYGWIN__))
pthread_setname_np(pthread_self(), "Main accepter"); pthread_setname_np(pthread_self(), "Main accepter");
#endif #endif
thisStream = Stream::get(); thisStream = Stream::get();