From 062c45ff0df6a52080dcd74433710d47127cbe29 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 15 May 2012 15:02:37 +0200
Subject: xserver mesa git update 15 May 2012

---
 xorg-server/hw/kdrive/src/kdrive.h                | 3 ---
 xorg-server/hw/kdrive/src/kinput.c                | 2 --
 xorg-server/hw/xfree86/common/xf86xv.c            | 1 -
 xorg-server/hw/xfree86/common/xf86xvmc.c          | 2 --
 xorg-server/hw/xfree86/dixmods/extmod/xvmodproc.h | 4 ++++
 5 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'xorg-server/hw')

diff --git a/xorg-server/hw/kdrive/src/kdrive.h b/xorg-server/hw/kdrive/src/kdrive.h
index 6c2f29309..293798aa0 100644
--- a/xorg-server/hw/kdrive/src/kdrive.h
+++ b/xorg-server/hw/kdrive/src/kdrive.h
@@ -551,9 +551,6 @@ void
 void
  KdEnableInput(void);
 
-void
- ProcessInputEvents(void);
-
 void
  KdRingBell(KdKeyboardInfo * ki, int volume, int pitch, int duration);
 
diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c
index e16fe78f2..66cdf675a 100644
--- a/xorg-server/hw/kdrive/src/kinput.c
+++ b/xorg-server/hw/kdrive/src/kinput.c
@@ -702,8 +702,6 @@ KdKbdCtrl(DeviceIntPtr pDevice, KeybdCtrl * ctrl)
     ki->bellDuration = ctrl->bell_duration;
 }
 
-extern KeybdCtrl defaultKeyboardControl;
-
 static int
 KdKeyboardProc(DeviceIntPtr pDevice, int onoff)
 {
diff --git a/xorg-server/hw/xfree86/common/xf86xv.c b/xorg-server/hw/xfree86/common/xf86xv.c
index 88e2f314b..0e5b0cf0f 100644
--- a/xorg-server/hw/xfree86/common/xf86xv.c
+++ b/xorg-server/hw/xfree86/common/xf86xv.c
@@ -51,7 +51,6 @@
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/Xvproto.h>
 #include "xvdix.h"
-#include "xvmodproc.h"
 
 #include "xf86xvpriv.h"
 
diff --git a/xorg-server/hw/xfree86/common/xf86xvmc.c b/xorg-server/hw/xfree86/common/xf86xvmc.c
index e58465289..7321efa43 100644
--- a/xorg-server/hw/xfree86/common/xf86xvmc.c
+++ b/xorg-server/hw/xfree86/common/xf86xvmc.c
@@ -40,8 +40,6 @@
 #include "resource.h"
 #include "dixstruct.h"
 
-#include "xvmodproc.h"
-
 #include "xf86xvpriv.h"
 #include "xf86xvmc.h"
 
diff --git a/xorg-server/hw/xfree86/dixmods/extmod/xvmodproc.h b/xorg-server/hw/xfree86/dixmods/extmod/xvmodproc.h
index be51e559d..009054760 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/xvmodproc.h
+++ b/xorg-server/hw/xfree86/dixmods/extmod/xvmodproc.h
@@ -3,6 +3,8 @@
 #include <dix-config.h>
 #endif
 
+#ifndef XVMODPROC_H
+#define XVMODPROC_H
 #include "xvmcext.h"
 
 extern DevPrivateKey (*XvGetScreenKeyProc) (void);
@@ -11,3 +13,5 @@ extern int (*XvScreenInitProc) (ScreenPtr);
 extern int (*XvMCScreenInitProc) (ScreenPtr, int, XvMCAdaptorPtr);
 
 extern void XvRegister(void);
+
+#endif /* XVMODPROC_H */
-- 
cgit v1.2.3