aboutsummaryrefslogtreecommitdiff
path: root/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_cmsProp.c.X.original
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-05 10:16:00 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-05 10:16:00 +0200
commitd14cc5361f7db7016b7cbb1cc59d8500101d9f27 (patch)
tree28bb620b5a39a9f649393e5ad113b07089fafe2b /doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_cmsProp.c.X.original
parent74a52dd354cc638c9f5fdedb0606b3b69e2b488a (diff)
downloadnx-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_cmsProp.c.X.original')
-rw-r--r--doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_cmsProp.c.X.original14
1 files changed, 0 insertions, 14 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_cmsProp.c.X.original b/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_cmsProp.c.X.original
deleted file mode 100644
index c929125f7..000000000
--- a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_cmsProp.c.X.original
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./nx-X11/lib/X11/cmsProp.c.X.original 2015-02-13 14:03:44.624443872 +0100
-+++ ./nx-X11/lib/X11/cmsProp.c 2015-02-10 19:13:12.948717938 +0100
-@@ -121,7 +121,11 @@
- char *prop_ret;
- int format_ret;
- long len = 6516;
-+ #ifdef NXAGENT_SERVER
-+ unsigned long nitems_ret, after_ret = 0;
-+ #else
- unsigned long nitems_ret, after_ret;
-+ #endif
- Atom atom_ret;
-
- while (XGetWindowProperty (pDpy, w, property, 0, len, False,