wxString::Right() changed to AfterLast() (config works again)

[wxWidgets.git] / src / common / socket.cpp

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 9b7fbe2ecdc16cd299b098af653f872ead6ce8a0..6b1d1992a21ab8f9d7b799616aa015b6cc9b5f36 100644 (file)
--- 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Some patch ///// END
 /////////////////////////////////////////////////////////////////////////////
 

+#ifdef GetClassInfo
+#undef GetClassInfo
+#endif
+

 // --------------------------------------------------------------
 // Module
 // --------------------------------------------------------------
 // --------------------------------------------------------------
 // Module
 // --------------------------------------------------------------


@@ -518,11 +522,10 @@ void wxSocketBase::Discard()
 // Meanwhile, if your compiler complains about socklen_t,
 // switch lines below.
 
 // 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
 #else

-#define wxSOCKET_INT int
+#   define wxSOCKET_INT int

 #endif
 
 // --------------------------------------------------------------
 #endif
 
 // --------------------------------------------------------------