X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=blobdiff_plain;f=octopi%2Flibrary%2Fsockets%2Fspocket.cpp;fp=octopi%2Flibrary%2Fsockets%2Fspocket.cpp;h=c73158aa77b89dadc3035858249a96b077266940;hp=0580b1f13c0bdfcdfa2d1cd20398db9be1833d11;hb=de0da7f2f7958d4ba652ff2ef5c79991700141ac;hpb=a4c99c6006b3aa20b5f65f02c2d30db7e790083a diff --git a/octopi/library/sockets/spocket.cpp b/octopi/library/sockets/spocket.cpp index 0580b1f1..c73158aa 100644 --- a/octopi/library/sockets/spocket.cpp +++ b/octopi/library/sockets/spocket.cpp @@ -27,7 +27,8 @@ #include #include -#ifdef __UNIX__ +//hmmm: put this bag o headers into a similar thing to windoze helper. maybe just have an os_helper file that combines both? +//#ifdef __UNIX__ #include #include #include @@ -38,7 +39,7 @@ #include #include #include -#endif +//#endif using namespace basis; using namespace loggers; @@ -76,6 +77,7 @@ const int RESOLVE_INTERVAL = 300; #define CHECK_BOGUS(retval) \ if (is_bogus()) { return retval; /* this spocket is junk. */ } +/* #undef GRAB_LOCK #ifdef __WIN32__ // win32 seems to trip over selects unless we protect them. @@ -86,10 +88,13 @@ const int RESOLVE_INTERVAL = 300; #else #define GRAB_LOCK #endif +*/ + #define GRAB_LOCK -#ifdef __UNIX__ + +//#ifdef __UNIX__ SAFE_STATIC(mutex, __broken_pipe_synch, ) -#endif +//#endif spocket::spocket(const internet_address &where, sock_types type) : _type(type),