From aee514cfb5e5a59b7770699765ccdad8fe42f904 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Sun, 26 Oct 2008 11:16:05 +0100
Subject: [PATCH] xfree86: Fix compiler warnings (implicit declarations)

Add missing includes to fix the following warnings:
xf86DGA.c: In function 'DGAProcessKeyboardEvent':
xf86DGA.c:1050: warning: implicit declaration of function 'UpdateDeviceState'
xf86DGA.c:1050: warning: nested extern declaration of 'UpdateDeviceState'
xf86Xinput.c: In function 'xf86ActivateDevice':
xf86Xinput.c:303: warning: implicit declaration of function 'AssignTypeAndName'
xf86Xinput.c:303: warning: nested extern declaration of 'AssignTypeAndName'
xf86Xinput.c:311: warning: implicit declaration of function 'DeviceIsPointerType'
xf86Xinput.c:311: warning: nested extern declaration of 'DeviceIsPointerType'
xf86Xinput.c:324: warning: implicit declaration of function 'XkbSetExtension'
xf86Xinput.c:324: warning: nested extern declaration of 'XkbSetExtension'
---
 hw/xfree86/common/xf86DGA.c    | 1 +
 hw/xfree86/common/xf86Xinput.c | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index 83a1a6592..83bc411af 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -47,6 +47,7 @@
 #endif
 #include "xf86Xinput.h"
 #include "exglobals.h"
+#include "exevents.h"
 
 #include "mi.h"
 
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index d4040481c..f99bfb700 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -62,6 +62,7 @@
 #include "mipointer.h"
 #include "xf86InPriv.h"
 #include "compiler.h"
+#include "extinit.h"
 
 #ifdef DPMSExtension
 #define DPMS_SERVER
@@ -89,6 +90,10 @@
 #include "dgaproc.h"
 #endif
 
+#ifdef XKB
+#include "xkbsrv.h"
+#endif
+
 #include "os.h"
 
 EventListPtr xf86Events = NULL;