aboutsummaryrefslogtreecommitdiff
path: root/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_IfEvent.c.X.original
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-02-26 08:14:28 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-02-26 08:14:28 +0100
commitabd6cf1bdd661f126af2a721cb3f467f3a6db9f7 (patch)
treeaa109d560c5c340aa537c1e59b866be5acd62205 /doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_IfEvent.c.X.original
parent2eb85d140fdd582e6bf7086f0bbba08fa58c836c (diff)
downloadnx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.tar.gz
nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.tar.bz2
nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.zip
rename original NX patches, so that we can see the patched file's name in the patch file name.
Diffstat (limited to 'doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_IfEvent.c.X.original')
-rw-r--r--doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_IfEvent.c.X.original13
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_IfEvent.c.X.original b/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_IfEvent.c.X.original
new file mode 100644
index 000000000..fb5e164a3
--- /dev/null
+++ b/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_IfEvent.c.X.original
@@ -0,0 +1,13 @@
+--- ./nx-X11/lib/X11/IfEvent.c.X.original 2015-02-13 14:03:44.620443950 +0100
++++ ./nx-X11/lib/X11/IfEvent.c 2015-02-10 19:13:12.796723642 +0100
+@@ -71,5 +71,10 @@
+ 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
+ }
+ }