[PATCH 7/7] dix: Cleanup dix.h to match the refactoring suffered by dixutils.c

[Fernando Carrijo]

Signed-off-by: Fernando Carrijo <fcarrijo at yahoo.com.br>
---
 include/dix.h |   44 +++++++++++++++++++++-----------------------
 1 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/include/dix.h b/include/dix.h
index 440b9eb..e435456 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -172,6 +172,13 @@ extern _X_EXPORT void MarkClientException(
     ClientPtr /*client*/);
 
 extern _X_HIDDEN Bool CreateConnectionBlock(void);
+
+void
+EnableLimitedSchedulingLatency(void);
+
+void
+DisableLimitedSchedulingLatency(void);
+
 /* dixutils.c */
 
 extern _X_EXPORT int CompareISOLatin1Lowered(
@@ -180,6 +187,18 @@ extern _X_EXPORT int CompareISOLatin1Lowered(
     unsigned char * /*b*/,
     int blen);
 
+extern _X_EXPORT void NoopDDA(void);
+
+extern _X_EXPORT int AlterSaveSetForClient(
+    ClientPtr /*client*/,
+    WindowPtr /*pWin*/,
+    unsigned /*mode*/,
+    Bool /*toRoot*/,
+    Bool /*map*/);
+
+extern _X_EXPORT void DeleteWindowFromAnySaveSet(
+    WindowPtr /*pWin*/);
+
 /* lookup.c */
 
 extern _X_EXPORT int dixLookupWindow(
@@ -213,17 +232,6 @@ extern _X_EXPORT int dixLookupClient(
     ClientPtr client,
     Mask access_mode);
 
-extern _X_EXPORT void NoopDDA(void);
-
-extern _X_EXPORT int AlterSaveSetForClient(
-    ClientPtr /*client*/,
-    WindowPtr /*pWin*/,
-    unsigned /*mode*/,
-    Bool /*toRoot*/,
-    Bool /*map*/);
-  
-extern _X_EXPORT void DeleteWindowFromAnySaveSet(
-    WindowPtr /*pWin*/);
 /* blockhandler.c */
 
 extern _X_EXPORT void BlockHandler(
@@ -234,12 +242,6 @@ extern _X_EXPORT void WakeupHandler(
     int /*result*/,
     pointer /*pReadmask*/);
 
-void
-EnableLimitedSchedulingLatency(void);
-
-void
-DisableLimitedSchedulingLatency(void);
-
 typedef void (* WakeupHandlerProcPtr)(
     pointer /* blockData */,
     int /* result */,
@@ -340,7 +342,6 @@ extern _X_EXPORT WindowPtr GetCurrentRootWindow(DeviceIntPtr pDev);
 
 extern _X_EXPORT WindowPtr GetSpriteWindow(DeviceIntPtr pDev);
 
-
 extern _X_EXPORT void NoticeEventTime(InternalEvent *ev);
 
 extern void EnqueueEvent(
@@ -467,13 +468,10 @@ extern void DeleteWindowFromAnyEvents(
     WindowPtr	/* pWin */,
     Bool /* freeResources */);
 
-
 extern Mask EventMaskForClient(
     WindowPtr /* pWin */,
     ClientPtr /* client */);
 
-
-
 extern _X_EXPORT int DeliverEvents(
     WindowPtr /*pWin*/,
     xEventPtr /*xE*/,
@@ -526,7 +524,6 @@ ScreenRestructured (ScreenPtr pScreen);
 
 extern _X_EXPORT int ffs(int i);
 
-
 /*
  *  ServerGrabCallback stuff
  */
@@ -575,16 +572,17 @@ extern _X_HIDDEN void CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
 extern _X_HIDDEN int CorePointerProc(DeviceIntPtr dev, int what);
 extern _X_HIDDEN int CoreKeyboardProc(DeviceIntPtr dev, int what);
 
-
 /*
  * These are deprecated compatibility functions and will be removed soon!
  * Please use the noted replacements instead.
  */
+
 /* replaced by dixLookupWindow */
 extern _X_EXPORT WindowPtr SecurityLookupWindow(
     XID id,
     ClientPtr client,
     Mask access_mode);
+
 /* replaced by dixLookupWindow */
 extern _X_EXPORT WindowPtr LookupWindow(
     XID id,
-- 
1.7.0.4