X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee4c6942b49d6ea13258437466c5735b1ba3ec6a..08159082b5d9335f9709c0cc06a9ff0aaf15e274:/src/common/socket.cpp diff --git a/src/common/socket.cpp b/src/common/socket.cpp index 9b7fbe2ecd..6b1d1992a2 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -185,6 +185,10 @@ int PASCAL FAR __WSAFDIsSet(SOCKET fd, fd_set FAR *set) // Some patch ///// END ///////////////////////////////////////////////////////////////////////////// +#ifdef GetClassInfo +#undef GetClassInfo +#endif + // -------------------------------------------------------------- // Module // -------------------------------------------------------------- @@ -518,11 +522,10 @@ void wxSocketBase::Discard() // Meanwhile, if your compiler complains about socklen_t, // switch lines below. -#if defined(__LINUX__) -// #if 0 -#define wxSOCKET_INT socklen_t +#if wxHAVE_GLIBC2 +# define wxSOCKET_INT socklen_t #else -#define wxSOCKET_INT int +# define wxSOCKET_INT int #endif // --------------------------------------------------------------