[PATCH:libX11] Remove unused ETEST & ESZTEST macros from XlibInt.c

Alan Coopersmith alan.coopersmith at oracle.com
Fri Jan 3 23:47:15 PST 2014


Left behind when 15e5eaf62897 removed support for building without XCB.

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 src/XlibInt.c |   33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/src/XlibInt.c b/src/XlibInt.c
index 7521f12..a5350e9 100644
--- a/src/XlibInt.c
+++ b/src/XlibInt.c
@@ -74,27 +74,6 @@ xthread_t (*_Xthread_self_fn)(void) = NULL;
 
 #endif /* XTHREADS */
 
-/* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX
- * systems are broken and return EWOULDBLOCK when they should return EAGAIN
- */
-#ifdef WIN32
-#define ETEST() (WSAGetLastError() == WSAEWOULDBLOCK)
-#else
-#ifdef __CYGWIN__ /* Cygwin uses ENOBUFS to signal socket is full */
-#define ETEST() (errno == EAGAIN || errno == EWOULDBLOCK || errno == ENOBUFS)
-#else
-#if defined(EAGAIN) && defined(EWOULDBLOCK)
-#define ETEST() (errno == EAGAIN || errno == EWOULDBLOCK)
-#else
-#ifdef EAGAIN
-#define ETEST() (errno == EAGAIN)
-#else
-#define ETEST() (errno == EWOULDBLOCK)
-#endif /* EAGAIN */
-#endif /* EAGAIN && EWOULDBLOCK */
-#endif /* __CYGWIN__ */
-#endif /* WIN32 */
-
 #ifdef WIN32
 #define ECHECK(err) (WSAGetLastError() == err)
 #define ESET(val) WSASetLastError(val)
@@ -108,18 +87,6 @@ xthread_t (*_Xthread_self_fn)(void) = NULL;
 #endif
 #endif
 
-#if defined(LOCALCONN) || defined(LACHMAN)
-#ifdef EMSGSIZE
-#define ESZTEST() (ECHECK(EMSGSIZE) || ECHECK(ERANGE))
-#else
-#define ESZTEST() ECHECK(ERANGE)
-#endif
-#else
-#ifdef EMSGSIZE
-#define ESZTEST() ECHECK(EMSGSIZE)
-#endif
-#endif
-
 #ifdef __UNIXOS2__
 #include <limits.h>
 #define MAX_PATH _POSIX_PATH_MAX
-- 
1.7.9.2



More information about the xorg-devel mailing list