3 files changed, 1 insertions, 37 deletions
diff --git a/libX11/src/XlibInt.c b/libX11/src/XlibInt.c
index 7521f12ad..a5350e953 100644
--- a/libX11/src/XlibInt.c
+++ b/libX11/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
diff --git a/libX11/src/xkb/XKB.c b/libX11/src/xkb/XKB.c
index 8a9795982..6413ba274 100644
--- a/libX11/src/xkb/XKB.c
+++ b/libX11/src/xkb/XKB.c
@@ -169,9 +169,6 @@ XkbSelectEventDetails(Display *dpy,
         /* doesn't.   Make sure that we always request the stuff */
         /* that the implicit support needs, and just filter out anything */
         /* the client doesn't want later */
-        req->affectWhich = 0;
-        req->selectAll = 0;
-        req->clear = 0;
         req->affectMap = (CARD16) affect;
         req->map = (CARD16) details | (XkbAllClientInfoMask & affect);
         req->affectWhich = XkbMapNotifyMask;
diff --git a/libX11/src/xkb/XKBGeom.c b/libX11/src/xkb/XKBGeom.c
index 6a1c74a4f..feaaab6f8 100644
--- a/libX11/src/xkb/XKBGeom.c
+++ b/libX11/src/xkb/XKBGeom.c
@@ -476,9 +476,9 @@ _XkbReadGeomOverlay(XkbReadBufferPtr buf,
         if (rowWire == NULL)
             return BadLength;
         row = XkbAddGeomOverlayRow(ol, rowWire->rowUnder, rowWire->nKeys);
-        row->row_under = rowWire->rowUnder;
         if (!row)
             return BadAlloc;
+        row->row_under = rowWire->rowUnder;
         if (rowWire->nKeys < 1)
             continue;
         keyWire = (xkbOverlayKeyWireDesc *)