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_Xt_NextEvent.c.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_Xt_NextEvent.c.X.original')
-rw-r--r-- | doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_Xt_NextEvent.c.X.original | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_Xt_NextEvent.c.X.original b/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_Xt_NextEvent.c.X.original deleted file mode 100644 index 6ddefa10c..000000000 --- a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_Xt_NextEvent.c.X.original +++ /dev/null @@ -1,42 +0,0 @@ ---- ./nx-X11/lib/Xt/NextEvent.c.X.original 2015-02-13 14:03:44.656443242 +0100 -+++ ./nx-X11/lib/Xt/NextEvent.c 2015-02-13 14:03:44.656443242 +0100 -@@ -58,6 +58,24 @@ - in this Software without prior written authorization from The Open Group. - - */ -+ -+/**************************************************************************/ -+/* */ -+/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ -+/* */ -+/* NX-X11, NX protocol compression and NX extensions to this software */ -+/* are copyright of NoMachine. Redistribution and use of the present */ -+/* software is allowed according to terms specified in the file LICENSE */ -+/* which comes in the source distribution. */ -+/* */ -+/* Check http://www.nomachine.com/licensing.html for applicability. */ -+/* */ -+/* NX and NoMachine are trademarks of Medialogic S.p.A. */ -+/* */ -+/* All rights reserved. */ -+/* */ -+/**************************************************************************/ -+ - /* $XFree86: xc/lib/Xt/NextEvent.c,v 3.26 2002/06/04 21:55:42 dawes Exp $ */ - - #ifdef HAVE_CONFIG_H -@@ -345,6 +363,14 @@ - wait_fds_ptr_t wf) - { - #ifndef USE_POLL -+ -+#if defined(NX_TRANS_SOCKET) && defined(NX_TRANS_TEST) -+ -+ fprintf(stderr, "Xt::IoWait: Select called with [%d][%p][%p][%p][%p].\n", -+ wf->nfds, (void *) &wf->rmask, (void *) &wf->wmask, (void *) &wf->emask, -+ (void *) wt->wait_time_ptr); -+#endif -+ - return Select (wf->nfds, &wf->rmask, &wf->wmask, &wf->emask, - wt->wait_time_ptr); - #else |