From 20fd4783247b1b93d9675dc36768dd1ed59ba2d3 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 15 Nov 2007 17:01:33 -0500 Subject: [PATCH] Small static cleanups on dix/ --- dix/atom.c | 2 -- dix/dispatch.c | 4 ++-- dix/events.c | 4 ++-- include/dix.h | 13 ------------- 4 files changed, 4 insertions(+), 19 deletions(-) diff --git a/dix/atom.c b/dix/atom.c index 6ae3e31df..c968c1e5a 100644 --- a/dix/atom.c +++ b/dix/atom.c @@ -209,5 +209,3 @@ InitAtoms(void) if (lastAtom != XA_LAST_PREDEFINED) AtomError (); } - - diff --git a/dix/dispatch.c b/dix/dispatch.c index 8c76eb12e..c356aed30 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -249,7 +249,7 @@ UpdateCurrentTimeIf(void) currentTime = systime; } -void +static void InitSelections(void) { if (CurrentSelections) @@ -3836,7 +3836,7 @@ ProcInitialConnection(ClientPtr client) return (client->noClientException); } -int +static int SendConnSetup(ClientPtr client, char *reason) { xWindowRoot *root; diff --git a/dix/events.c b/dix/events.c index 12c299a3b..85f42b31e 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1184,7 +1184,7 @@ FreezeThaw(DeviceIntPtr dev, Bool frozen) dev->public.processInputProc = dev->public.realInputProc; } -void +static void ComputeFreezes(void) { DeviceIntPtr replayDev = syncEvents.replayDev; @@ -1268,7 +1268,7 @@ ScreenRestructured (ScreenPtr pScreen) } #endif -void +static void CheckGrabForSyncs(DeviceIntPtr thisDev, Bool thisMode, Bool otherMode) { GrabPtr grab = thisDev->grab; diff --git a/include/dix.h b/include/dix.h index 6a67d14dd..c987548bf 100644 --- a/include/dix.h +++ b/include/dix.h @@ -158,8 +158,6 @@ extern void UpdateCurrentTime(void); extern void UpdateCurrentTimeIf(void); -extern void InitSelections(void); - extern void FlushClientCaches(XID /*id*/); extern int dixDestroyPixmap( @@ -187,10 +185,6 @@ extern void DeleteWindowFromAnySelections( extern void MarkClientException( ClientPtr /*client*/); -extern int SendConnSetup( - ClientPtr /*client*/, - char* /*reason*/); - #if defined(DDXBEFORERESET) extern void ddxBeforeReset (void); #endif @@ -362,13 +356,6 @@ extern void EnqueueEvent( DeviceIntPtr /* device */, int /* count */); -extern void ComputeFreezes(void); - -extern void CheckGrabForSyncs( - DeviceIntPtr /* dev */, - Bool /* thisMode */, - Bool /* otherMode */); - extern void ActivatePointerGrab( DeviceIntPtr /* mouse */, GrabPtr /* grab */,