diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-02-26 08:14:28 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-02-26 08:14:28 +0100 |
| commit | abd6cf1bdd661f126af2a721cb3f467f3a6db9f7 (patch) | |
| tree | aa109d560c5c340aa537c1e59b866be5acd62205 /doc/nx-X11_vs_XOrg69_patches/Xlibint.h.NX.patch | |
| parent | 2eb85d140fdd582e6bf7086f0bbba08fa58c836c (diff) | |
| download | nx-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/Xlibint.h.NX.patch')
| -rw-r--r-- | doc/nx-X11_vs_XOrg69_patches/Xlibint.h.NX.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/Xlibint.h.NX.patch b/doc/nx-X11_vs_XOrg69_patches/Xlibint.h.NX.patch deleted file mode 100644 index a23172ed9..000000000 --- a/doc/nx-X11_vs_XOrg69_patches/Xlibint.h.NX.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- ./nx-X11/lib/X11/Xlibint.h.X.original 2015-02-13 14:03:44.624443872 +0100 -+++ ./nx-X11/lib/X11/Xlibint.h 2015-02-10 19:13:12.888720189 +0100 -@@ -27,6 +27,24 @@ - 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/X11/Xlibint.h,v 3.27 2003/05/27 22:26:26 tsi Exp $ */ - - #ifndef _XLIBINT_H_ -@@ -44,6 +62,15 @@ - #include <X11/Xproto.h> /* to declare xEvent */ - #include <X11/XlibConf.h> /* for configured options like XTHREADS */ - -+#ifdef NX_TRANS_SOCKET -+ -+#include "NXvars.h" -+ -+#define _XGetIOError(dpy) \ -+ (dpy -> flags & XlibDisplayIOError) -+ -+#endif -+ - #ifdef WIN32 - #define _XFlush _XFlushIt - #endif -@@ -348,9 +375,15 @@ - #define LOCKED 1 - #define UNLOCKED 0 - -+#ifdef NX_TRANS_SOCKET -+#ifndef BUFSIZE /* Output buffer size is configurable */ -+#define BUFSIZE 8192 /* but this is still used for reading. */ -+#endif -+#else - #ifndef BUFSIZE - #define BUFSIZE 2048 /* X output buffer size. */ - #endif -+#endif - #ifndef PTSPERBATCH - #define PTSPERBATCH 1024 /* point batching */ - #endif |