diff -r cbde85c8c878 -r 1608018c5ff2 src/network/core/os_abstraction.h --- a/src/network/core/os_abstraction.h Wed Jan 03 20:00:29 2007 +0000 +++ b/src/network/core/os_abstraction.h Thu Jan 11 13:16:26 2007 +0000 @@ -32,7 +32,7 @@ #endif /* WIN32 */ /* UNIX stuff */ -#if defined(UNIX) +#if defined(UNIX) && !defined(__OS2__) # define SOCKET int # define INVALID_SOCKET -1 # if !defined(__MORPHOS__) && !defined(__AMIGA__) @@ -150,7 +150,7 @@ # endif #endif // __MORPHOS__ || __AMIGA__ -static inline bool SetNonBlocking(int d) +static inline bool SetNonBlocking(const int d) { #ifdef WIN32 u_long nonblocking = 1; @@ -164,7 +164,7 @@ #endif } -static inline bool SetNoDelay(int d) +static inline bool SetNoDelay(const int d) { /* XXX should this be done at all? */ #if !defined(BEOS_NET_SERVER) // not implemented on BeOS net_server