diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:41 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:41 +0000 |
| commit | 3d0889d2b8d326319e17ffc49e114892ef54f979 (patch) | |
| tree | 75c1586c56260fa99e560cb85302ed4daf8440a3 /src/XGetBMap.c | |
| parent | 6b1f87ebe718c9c745d5f4b26343ee3cf34ff5cc (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'src/XGetBMap.c')
| -rw-r--r-- | src/XGetBMap.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/XGetBMap.c b/src/XGetBMap.c index 7c814fe..fa5eab6 100644 --- a/src/XGetBMap.c +++ b/src/XGetBMap.c @@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +/* $XFree86: xc/lib/Xi/XGetBMap.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */ /*********************************************************************** * @@ -52,11 +53,13 @@ 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" + #ifdef MIN /* some systems define this in <sys/param.h> */ #undef MIN #endif @@ -72,7 +75,7 @@ XGetDeviceButtonMapping (dpy, device, map, nmap) int status = 0; unsigned char mapping[256]; /* known fixed size */ long nbytes; - XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy); + XExtDisplayInfo *info = XInput_find_display (dpy); register xGetDeviceButtonMappingReq *req; xGetDeviceButtonMappingReply rep; |