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_XKBMAlloc.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_X11_XKBMAlloc.c.X.original')
-rw-r--r-- | doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_XKBMAlloc.c.X.original | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_XKBMAlloc.c.X.original b/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_XKBMAlloc.c.X.original deleted file mode 100644 index de5574c32..000000000 --- a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_XKBMAlloc.c.X.original +++ /dev/null @@ -1,84 +0,0 @@ ---- ./nx-X11/lib/X11/XKBMAlloc.c.X.original 2015-02-13 14:03:44.620443950 +0100 -+++ ./nx-X11/lib/X11/XKBMAlloc.c 2015-02-10 19:13:12.836722141 +0100 -@@ -738,8 +738,13 @@ - _XkbFree(prev_key_sym_map); - return BadAlloc; - } -+#ifdef NXAGENT_SERVER -+ bzero((char *)&xkb->map->key_sym_map[xkb->max_key_code+1], -+ tmp*sizeof(XkbSymMapRec)); -+#else - bzero((char *)&xkb->map->key_sym_map[xkb->max_key_code], - tmp*sizeof(XkbSymMapRec)); -+#endif - if (changes) { - changes->map.changed= _ExtendRange(changes->map.changed, - XkbKeySymsMask,maxKC, -@@ -756,7 +761,11 @@ - _XkbFree(prev_modmap); - return BadAlloc; - } -+#ifdef NXAGENT_SERVER -+ bzero((char *)&xkb->map->modmap[xkb->max_key_code+1],tmp); -+#else - bzero((char *)&xkb->map->modmap[xkb->max_key_code],tmp); -+#endif - if (changes) { - changes->map.changed= _ExtendRange(changes->map.changed, - XkbModifierMapMask,maxKC, -@@ -775,8 +784,13 @@ - _XkbFree(prev_behaviors); - return BadAlloc; - } -+#ifdef NXAGENT_SERVER -+ bzero((char *)&xkb->server->behaviors[xkb->max_key_code+1], -+ tmp*sizeof(XkbBehavior)); -+#else - bzero((char *)&xkb->server->behaviors[xkb->max_key_code], - tmp*sizeof(XkbBehavior)); -+#endif - if (changes) { - changes->map.changed= _ExtendRange(changes->map.changed, - XkbKeyBehaviorsMask,maxKC, -@@ -793,8 +807,13 @@ - _XkbFree(prev_key_acts); - return BadAlloc; - } -+#ifdef NXAGENT_SERVER -+ bzero((char *)&xkb->server->key_acts[xkb->max_key_code+1], -+ tmp*sizeof(unsigned short)); -+#else - bzero((char *)&xkb->server->key_acts[xkb->max_key_code], - tmp*sizeof(unsigned short)); -+#endif - if (changes) { - changes->map.changed= _ExtendRange(changes->map.changed, - XkbKeyActionsMask,maxKC, -@@ -811,8 +830,13 @@ - _XkbFree(prev_vmodmap); - return BadAlloc; - } -+#ifdef NXAGENT_SERVER -+ bzero((char *)&xkb->server->vmodmap[xkb->max_key_code+1], -+ tmp*sizeof(unsigned short)); -+#else - bzero((char *)&xkb->server->vmodmap[xkb->max_key_code], - tmp*sizeof(unsigned short)); -+#endif - if (changes) { - changes->map.changed= _ExtendRange(changes->map.changed, - XkbVirtualModMapMask,maxKC, -@@ -830,8 +854,13 @@ - _XkbFree(prev_keys); - return BadAlloc; - } -+#ifdef NXAGENT_SERVER -+ bzero((char *)&xkb->names->keys[xkb->max_key_code+1], -+ tmp*sizeof(XkbKeyNameRec)); -+#else - bzero((char *)&xkb->names->keys[xkb->max_key_code], - tmp*sizeof(XkbKeyNameRec)); -+#endif - if (changes) { - changes->names.changed= _ExtendRange(changes->names.changed, - XkbKeyNamesMask,maxKC, |