diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 10:16:00 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 10:16:00 +0200 |
| commit | d14cc5361f7db7016b7cbb1cc59d8500101d9f27 (patch) | |
| tree | 28bb620b5a39a9f649393e5ad113b07089fafe2b /doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_Xlib.h.X.original | |
| parent | 74a52dd354cc638c9f5fdedb0606b3b69e2b488a (diff) | |
| download | nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.tar.gz nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.tar.bz2 nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.zip | |
doc/_attic_/: Introduce an "_attic_" folder. Move diffs between NoMachine's nx-X11 3.5 and X.org 6.9 here.
Diffstat (limited to 'doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_Xlib.h.X.original')
| -rw-r--r-- | doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_Xlib.h.X.original | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_Xlib.h.X.original b/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_Xlib.h.X.original deleted file mode 100644 index 794ccf09a..000000000 --- a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_Xlib.h.X.original +++ /dev/null @@ -1,30 +0,0 @@ ---- ./nx-X11/lib/X11/Xlib.h.X.original 2015-02-13 14:03:44.624443872 +0100 -+++ ./nx-X11/lib/X11/Xlib.h 2015-02-10 19:13:12.720726495 +0100 -@@ -2102,6 +2102,27 @@ - XPointer /* arg */ - ); - -+#ifdef NX_TRANS_SOCKET -+ -+/* -+ * This is just like XCheckIfEvent() but doesn't -+ * flush the output buffer if it can't read new -+ * events. -+ */ -+ -+extern Bool XCheckIfEventNoFlush( -+ Display* /* display */, -+ XEvent* /* event_return */, -+ Bool (*) ( -+ Display* /* display */, -+ XEvent* /* event */, -+ XPointer /* arg */ -+ ) /* predicate */, -+ XPointer /* arg */ -+); -+ -+#endif -+ - extern Bool XCheckMaskEvent( - Display* /* display */, - long /* event_mask */, |