summaryrefslogtreecommitdiff
path: root/Xi/closedev.c
diff options
context:
space:
mode:
Diffstat (limited to 'Xi/closedev.c')
-rw-r--r--Xi/closedev.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/Xi/closedev.c b/Xi/closedev.c
index 66fb185cb..1f7e7dbd2 100644
--- a/Xi/closedev.c
+++ b/Xi/closedev.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
+/* $XFree86: xc/programs/Xserver/Xi/closedev.c,v 3.4 2001/12/14 19:58:55 dawes Exp $ */
/***********************************************************************
*
@@ -61,13 +62,12 @@ SOFTWARE.
#include "scrnintstr.h" /* screen structure */
#include "XI.h"
#include "XIproto.h"
+#include "XIstubs.h"
+#include "extnsionst.h"
+#include "extinit.h" /* LookupDeviceIntRec */
+#include "exglobals.h"
-extern ScreenInfo screenInfo;
-extern WindowPtr *WindowTable;
-extern int IReqCode;
-extern int BadDevice;
-extern void (* ReplySwapVector[256]) ();
-DeviceIntPtr LookupDeviceIntRec();
+#include "closedev.h"
/***********************************************************************
*
@@ -137,6 +137,7 @@ ProcXCloseDevice(client)
*
*/
+void
DeleteEventsFromChildren(dev, p1, client)
DeviceIntPtr dev;
WindowPtr p1;
@@ -160,6 +161,7 @@ DeleteEventsFromChildren(dev, p1, client)
*
*/
+void
DeleteDeviceEvents (dev, pWin, client)
DeviceIntPtr dev;
WindowPtr pWin;
@@ -169,7 +171,7 @@ DeleteDeviceEvents (dev, pWin, client)
OtherInputMasks *pOthers;
GrabPtr grab, next;
- if (pOthers=wOtherInputMasks(pWin))
+ if ((pOthers = wOtherInputMasks(pWin)) != 0)
for (others=pOthers->inputClients; others;
others = others->next)
if (SameClient(others,client))