From d14cc5361f7db7016b7cbb1cc59d8500101d9f27 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 Jul 2016 10:16:00 +0200 Subject: doc/_attic_/: Introduce an "_attic_" folder. Move diffs between NoMachine's nx-X11 3.5 and X.org 6.9 here. --- .../nx-X11_lib_X11_PeekIfEv.c.X.original | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_PeekIfEv.c.X.original (limited to 'doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_PeekIfEv.c.X.original') diff --git a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_PeekIfEv.c.X.original b/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_PeekIfEv.c.X.original deleted file mode 100644 index 7d87f13b1..000000000 --- a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_PeekIfEv.c.X.original +++ /dev/null @@ -1,14 +0,0 @@ ---- ./nx-X11/lib/X11/PeekIfEv.c.X.original 2015-02-13 14:03:44.620443950 +0100 -+++ ./nx-X11/lib/X11/PeekIfEv.c 2015-02-10 19:13:12.952717788 +0100 -@@ -71,6 +71,11 @@ - if (prev && prev->qserial_num != qe_serial) - /* another thread has snatched this event */ - prev = NULL; -+#ifdef NX_TRANS_SOCKET -+ if (_XGetIOError(dpy)) { -+ return 0; -+ } -+#endif - } - } - -- cgit v1.2.3