Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x

Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214
Fixes ArcticaProject/nx-libs#157.

1 files changed, 13 insertions, 12 deletions

diff --git a/nx-X11/lib/X11/XKBSetGeom.c b/nx-X11/lib/X11/XKBSetGeom.c
index 8f7ba67a2..e951afaeb 100644
--- a/nx-X11/lib/X11/XKBSetGeom.c
+++ b/nx-X11/lib/X11/XKBSetGeom.c
@@ -6,19 +6,19 @@ software and its documentation for any purpose and without
 fee is hereby granted, provided that the above copyright
 notice appear in all copies and that both that copyright
 notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
 of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
+Silicon Graphics makes no representation about the suitability
 of this software for any purpose. It is provided "as is"
 without any express or implied warranty.
 
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
 AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -66,7 +66,7 @@ _SizeGeomProperties(XkbGeometryPtr geom)
 {
 register int 	i,size;
 XkbPropertyPtr	prop;
-    
+
     for (size=i=0,prop=geom->properties;i<geom->num_properties;i++,prop++) {
 	size+= _SizeCountedString(prop->name);
 	size+= _SizeCountedString(prop->value);
@@ -170,7 +170,7 @@ _WriteGeomProperties(char *wire,XkbGeometryPtr geom)
 {
 register int 	i;
 register XkbPropertyPtr	prop;
-    
+
     for (i=0,prop=geom->properties;i<geom->num_properties;i++,prop++) {
 	wire= _WriteCountedString(wire,prop->name);
 	wire= _WriteCountedString(wire,prop->value);
@@ -373,7 +373,7 @@ static char *
 _WriteGeomKeyAliases(char *wire,XkbGeometryPtr geom)
 {
 register int sz;
-    
+
     sz= geom->num_key_aliases*(XkbKeyNameLength*2);
     if (sz>0) {
 	memcpy(wire,(char *)geom->key_aliases,sz);
@@ -440,7 +440,8 @@ Status ret;
     if ( (!geom) || (dpy->flags & XlibDisplayNoXkb) ||
 	(!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL)))
 	return BadAccess;
-    
+
+    LockDisplay(dpy);
     GetReq(kbSetGeometry, req);
     req->reqType = dpy->xkb_info->codes->major_opcode;
     req->xkbReqType = X_kbSetGeometry;