summaryrefslogtreecommitdiff
path: root/src/XGrDvBut.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-17 19:03:41 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-17 19:03:41 +0000
commit3d0889d2b8d326319e17ffc49e114892ef54f979 (patch)
tree75c1586c56260fa99e560cb85302ed4daf8440a3 /src/XGrDvBut.c
parent6b1f87ebe718c9c745d5f4b26343ee3cf34ff5cc (diff)
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'src/XGrDvBut.c')
-rw-r--r--src/XGrDvBut.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/XGrDvBut.c b/src/XGrDvBut.c
index fc6b400..34a3fa1 100644
--- a/src/XGrDvBut.c
+++ b/src/XGrDvBut.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
+/* $XFree86: xc/lib/Xi/XGrDvBut.c,v 3.5 2002/10/16 00:37:29 dawes Exp $ */
/***********************************************************************
*
@@ -52,11 +53,12 @@ SOFTWARE.
*
*/
-#include "XI.h"
-#include "XIproto.h"
-#include "Xlibint.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
int
XGrabDeviceButton (dpy, dev, button, modifiers, modifier_device,
@@ -75,7 +77,7 @@ XGrabDeviceButton (dpy, dev, button, modifiers, modifier_device,
int other_devices_mode;
{
register xGrabDeviceButtonReq *req;
- XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+ XExtDisplayInfo *info = XInput_find_display (dpy);
LockDisplay (dpy);
if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)