merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE

4 files changed, 30 insertions, 33 deletions

diff --git a/src/XExtInt.c b/src/XExtInt.c
index ebd0614..09d1aa2 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XExtInt.c,v 3.7 2002/10/16 00:37:28 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XExtInt.c,v 3.8 2003/07/07 15:34:22 eich Exp $ */
 
 /***********************************************************************
  *
@@ -196,7 +196,7 @@ _XiCheckExtInit(dpy, version_index)
 	    return (-1);
 	    }
 	((XInputData *) info->data)->vers =
-	    XGetExtensionVersion (dpy, "XInputExtension");
+	    _XiGetExtensionVersion (dpy, "XInputExtension");
 	}
 
     if (versions[version_index].major_version > Dont_Check)
diff --git a/src/XGetKMap.c b/src/XGetKMap.c
index 3ea7819..fd14050 100644
--- a/src/XGetKMap.c
+++ b/src/XGetKMap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XGetKMap.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XGetKMap.c,v 3.5 2003/11/17 22:20:21 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -60,9 +60,8 @@ SOFTWARE.
 #include <X11/extensions/extutil.h>
 #include "XIint.h"
 
-KeySym 
-#if NeedFunctionPrototypes
-*XGetDeviceKeyMapping (
+KeySym *
+XGetDeviceKeyMapping (
     register	Display 	*dpy,
     XDevice			*dev,
 #if NeedWidePrototypes
@@ -72,14 +71,6 @@ KeySym
 #endif
     int				keycount,
     int				*syms_per_code)
-#else
-*XGetDeviceKeyMapping (dpy, dev, first, keycount, syms_per_code)
-    register	Display 	*dpy;
-    XDevice			*dev;
-    KeyCode			first;
-    int				keycount;
-    int				*syms_per_code;		/* RETURN */
-#endif
     {
     long nbytes;
     register KeySym *mapping = NULL;
diff --git a/src/XGetVers.c b/src/XGetVers.c
index 0672e75..fa8cf7f 100644
--- a/src/XGetVers.c
+++ b/src/XGetVers.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XGetVers.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XGetVers.c,v 3.7 2003/11/17 22:20:21 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -60,23 +60,32 @@ SOFTWARE.
 #include <X11/extensions/extutil.h>
 #include "XIint.h"
 
-XExtensionVersion
-#if NeedFunctionPrototypes
-*XGetExtensionVersion (
+XExtensionVersion *
+XGetExtensionVersion (
+    register Display 	*dpy,
+    _Xconst char	*name)
+    {       
+    XExtensionVersion		*ext;
+
+    LockDisplay (dpy);
+    ext = _XiGetExtensionVersion (dpy, name);
+    if (ext != (XExtensionVersion *) NoSuchExtension) {
+	UnlockDisplay (dpy);
+	SyncHandle();
+    }
+    return (ext);
+    }
+
+XExtensionVersion *
+_XiGetExtensionVersion (
     register Display 	*dpy,
     _Xconst char	*name)
-#else
-*XGetExtensionVersion (dpy, name)
-    register Display 	*dpy;
-    char		*name;
-#endif
     {       
     xGetExtensionVersionReq 	*req;
     xGetExtensionVersionReply 	rep;
     XExtensionVersion		*ext;
     XExtDisplayInfo *info = XInput_find_display (dpy);
 
-    LockDisplay (dpy);
     if (_XiCheckExtInit(dpy, Dont_Check) == -1)
 	return ((XExtensionVersion *) NoSuchExtension);
 
@@ -89,8 +98,6 @@ XExtensionVersion
 
     if (! _XReply (dpy, (xReply *) &rep, 0, xTrue)) 
 	{
-	UnlockDisplay(dpy);
-	SyncHandle();
 	return (XExtensionVersion *) NULL;
 	}
     ext = (XExtensionVersion *) Xmalloc (sizeof (XExtensionVersion));
@@ -103,8 +110,6 @@ XExtensionVersion
 	    ext->minor_version = rep.minor_version;
 	    }
 	}
-    UnlockDisplay(dpy);
-    SyncHandle();
     return (ext);
     }
 
diff --git a/src/XIint.h b/src/XIint.h
index 1e8f124..8dfe80a 100644
--- a/src/XIint.h
+++ b/src/XIint.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/Xi/XIint.h,v 3.1 2001/08/01 00:44:39 tsi Exp $ */
+/* $XFree86: xc/lib/Xi/XIint.h,v 3.3 2003/11/17 22:20:22 dawes Exp $ */
 
 /*
  *	XIint.h - Header definition and support file for the internal
@@ -9,16 +9,17 @@
 #define _XIINT_H_
 
 extern XExtDisplayInfo * XInput_find_display(
-#if NeedFunctionPrototypes
 	Display*
-#endif
 );
 
 extern int _XiCheckExtInit(
-#if NeedFunctionPrototypes
 	Display*,
 	int
-#endif
+);
+
+extern XExtensionVersion * _XiGetExtensionVersion(
+	Display*,
+	_Xconst char*
 );
 
 #endif