Solved compiler errors and warnings

16 files changed, 68 insertions, 68 deletions

diff --git a/xorg-server/include/callback.h b/xorg-server/include/callback.h
index ffdbac270..3529225b4 100644
--- a/xorg-server/include/callback.h
+++ b/xorg-server/include/callback.h
@@ -70,14 +70,14 @@ typedef void (*CallbackProcPtr) (CallbackListPtr *, void *, void *);
 
 extern _X_EXPORT Bool AddCallback(CallbackListPtr * /*pcbl */ ,
                                   CallbackProcPtr /*callback */ ,
-                                  void */*data */ );
+                                  void * /*data */ );
 
 extern _X_EXPORT Bool DeleteCallback(CallbackListPtr * /*pcbl */ ,
                                      CallbackProcPtr /*callback */ ,
-                                     void */*data */ );
+                                     void * /*data */ );
 
 extern _X_EXPORT void _CallCallbacks(CallbackListPtr * /*pcbl */ ,
-                                     void */*call_data */ );
+                                     void * /*call_data */ );
 
 static inline void
 CallCallbacks(CallbackListPtr *pcbl, void *call_data)
diff --git a/xorg-server/include/colormap.h b/xorg-server/include/colormap.h
index 22229ca84..30e508557 100644
--- a/xorg-server/include/colormap.h
+++ b/xorg-server/include/colormap.h
@@ -82,14 +82,14 @@ extern _X_EXPORT int CreateColormap(Colormap /*mid */ ,
                                     int /*alloc */ ,
                                     int /*client */ );
 
-extern _X_EXPORT int FreeColormap(void */*pmap */ ,
+extern _X_EXPORT int FreeColormap(void * /*pmap */ ,
                                   XID /*mid */ );
 
 extern _X_EXPORT int TellLostMap(WindowPtr /*pwin */ ,
-                                 void */* Colormap *pmid */ );
+                                 void * /* Colormap *pmid */ );
 
 extern _X_EXPORT int TellGainedMap(WindowPtr /*pwin */ ,
-                                   void */* Colormap *pmid */ );
+                                   void * /* Colormap *pmid */ );
 
 extern _X_EXPORT int CopyColormapAndFree(Colormap /*mid */ ,
                                          ColormapPtr /*pSrc */ ,
@@ -126,7 +126,7 @@ extern _X_EXPORT int QueryColors(ColormapPtr /*pmap */ ,
                                  xrgb * /*prgbList */ ,
                                  ClientPtr client);
 
-extern _X_EXPORT int FreeClientPixels(void */*pcr */ ,
+extern _X_EXPORT int FreeClientPixels(void * /*pcr */ ,
                                       XID /*fakeid */ );
 
 extern _X_EXPORT int AllocColorCells(int /*client */ ,
diff --git a/xorg-server/include/cursor.h b/xorg-server/include/cursor.h
index 9da08affd..5e9ed92d4 100644
--- a/xorg-server/include/cursor.h
+++ b/xorg-server/include/cursor.h
@@ -68,7 +68,7 @@ extern _X_EXPORT DevScreenPrivateKeyRec cursorScreenDevPriv;
 
 extern _X_EXPORT CursorPtr rootCursor;
 
-extern _X_EXPORT int FreeCursor(void */*pCurs */ ,
+extern _X_EXPORT int FreeCursor(void * /*pCurs */ ,
                                 XID /*cid */ );
 
 extern _X_EXPORT CursorPtr RefCursor(CursorPtr /* cursor */);
diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h
index 8371df072..918f64397 100644
--- a/xorg-server/include/dix.h
+++ b/xorg-server/include/dix.h
@@ -147,14 +147,14 @@ extern _X_EXPORT void UpdateCurrentTime(void);
 
 extern _X_EXPORT void UpdateCurrentTimeIf(void);
 
-extern _X_EXPORT int dixDestroyPixmap(void */*value */ ,
+extern _X_EXPORT int dixDestroyPixmap(void * /*value */ ,
                                       XID /*pid */ );
 
 extern _X_EXPORT void InitClient(ClientPtr /*client */ ,
                                  int /*i */ ,
-                                 void */*ospriv */ );
+                                 void * /*ospriv */ );
 
-extern _X_EXPORT ClientPtr NextAvailableClient(void */*ospriv */ );
+extern _X_EXPORT ClientPtr NextAvailableClient(void * /*ospriv */ );
 
 extern _X_EXPORT void SendErrorToClient(ClientPtr /*client */ ,
                                         unsigned int /*majorCode */ ,
@@ -203,11 +203,11 @@ extern _X_EXPORT int AlterSaveSetForClient(ClientPtr /*client */ ,
 
 extern _X_EXPORT void DeleteWindowFromAnySaveSet(WindowPtr /*pWin */ );
 
-extern _X_EXPORT void BlockHandler(void */*pTimeout */ ,
-                                   void */*pReadmask */ );
+extern _X_EXPORT void BlockHandler(void * /*pTimeout */ ,
+                                   void * /*pReadmask */ );
 
 extern _X_EXPORT void WakeupHandler(int /*result */ ,
-                                    void */*pReadmask */ );
+                                    void * /*pReadmask */ );
 
 void
  EnableLimitedSchedulingLatency(void);
@@ -215,21 +215,21 @@ void
 void
  DisableLimitedSchedulingLatency(void);
 
-typedef void (*WakeupHandlerProcPtr) (void */* blockData */ ,
+typedef void (*WakeupHandlerProcPtr) (void * /* blockData */ ,
                                       int /* result */ ,
-                                      void */* pReadmask */ );
+                                      void * /* pReadmask */ );
 
 extern _X_EXPORT Bool RegisterBlockAndWakeupHandlers(BlockHandlerProcPtr
                                                      /*blockHandler */ ,
                                                      WakeupHandlerProcPtr
                                                      /*wakeupHandler */ ,
-                                                     void */*blockData */ );
+                                                     void * /*blockData */ );
 
 extern _X_EXPORT void RemoveBlockAndWakeupHandlers(BlockHandlerProcPtr
                                                    /*blockHandler */ ,
                                                    WakeupHandlerProcPtr
                                                    /*wakeupHandler */ ,
-                                                   void */*blockData */ );
+                                                   void * /*blockData */ );
 
 extern _X_EXPORT void InitBlockAndWakeupHandlers(void);
 
@@ -244,15 +244,15 @@ extern _X_EXPORT Bool QueueWorkProc(Bool (* /*function */ )(
                                                                void *
                                                                /*closure */ ),
                                     ClientPtr /*client */ ,
-                                    void */*closure */
+                                    void * /*closure */
     );
 
 typedef Bool (*ClientSleepProcPtr) (ClientPtr /*client */ ,
-                                    void */*closure */ );
+                                    void * /*closure */ );
 
 extern _X_EXPORT Bool ClientSleep(ClientPtr /*client */ ,
                                   ClientSleepProcPtr /* function */ ,
-                                  void */*closure */ );
+                                  void * /*closure */ );
 
 #ifndef ___CLIENTSIGNAL_DEFINED___
 #define ___CLIENTSIGNAL_DEFINED___
@@ -444,7 +444,7 @@ extern void
 RecalculateDeliverableEvents(WindowPtr /* pWin */ );
 
 extern _X_EXPORT int
-OtherClientGone(void */* value */ ,
+OtherClientGone(void * /* value */ ,
                 XID /* id */ );
 
 extern void
diff --git a/xorg-server/include/dixfont.h b/xorg-server/include/dixfont.h
index 40d80c141..baa4235e9 100644
--- a/xorg-server/include/dixfont.h
+++ b/xorg-server/include/dixfont.h
@@ -40,9 +40,9 @@ extern _X_EXPORT void QueueFontWakeup(FontPathElementPtr /*fpe */ );
 
 extern _X_EXPORT void RemoveFontWakeup(FontPathElementPtr /*fpe */ );
 
-extern _X_EXPORT void FontWakeup(void */*data */ ,
+extern _X_EXPORT void FontWakeup(void * /*data */ ,
                                  int /*count */ ,
-                                 void */*LastSelectMask */ );
+                                 void * /*LastSelectMask */ );
 
 extern _X_EXPORT int OpenFont(ClientPtr /*client */ ,
                               XID /*fid */ ,
@@ -50,7 +50,7 @@ extern _X_EXPORT int OpenFont(ClientPtr /*client */ ,
                               unsigned /*lenfname */ ,
                               const char * /*pfontname */ );
 
-extern _X_EXPORT int CloseFont(void */*pfont */ ,
+extern _X_EXPORT int CloseFont(void * /*pfont */ ,
                                XID /*fid */ );
 
 typedef struct _xQueryFontReply *xQueryFontReplyPtr;
diff --git a/xorg-server/include/dixgrabs.h b/xorg-server/include/dixgrabs.h
index d78d8127b..2d8c8584c 100644
--- a/xorg-server/include/dixgrabs.h
+++ b/xorg-server/include/dixgrabs.h
@@ -47,7 +47,7 @@ extern GrabPtr CreateGrab(int /* client */ ,
                           WindowPtr /* confineTo */ ,
                           CursorPtr /* cursor */ );
 
-extern _X_EXPORT int DeletePassiveGrab(void */* value */ ,
+extern _X_EXPORT int DeletePassiveGrab(void * /* value */ ,
                                        XID /* id */ );
 
 extern _X_EXPORT Bool GrabMatchesSecond(GrabPtr /* pFirstGrab */ ,
diff --git a/xorg-server/include/gc.h b/xorg-server/include/gc.h
index 94e68239e..1e69b5c3d 100755
--- a/xorg-server/include/gc.h
+++ b/xorg-server/include/gc.h
@@ -112,7 +112,7 @@ extern _X_EXPORT int CopyGC(GCPtr /*pgcSrc */ ,
                             GCPtr /*pgcDst */ ,
                             BITS32 /*mask */ );
 
-extern _X_EXPORT int FreeGC(void */*pGC */ ,
+extern _X_EXPORT int FreeGC(void * /*pGC */ ,
                             XID /*gid */ );
 
 extern _X_EXPORT void FreeGCperDepth(int /*screenNum */ );
diff --git a/xorg-server/include/gcstruct.h b/xorg-server/include/gcstruct.h
index c830ccde7..1adea22b5 100644
--- a/xorg-server/include/gcstruct.h
+++ b/xorg-server/include/gcstruct.h
@@ -78,7 +78,7 @@ typedef struct _GCFuncs {
 
     void (*ChangeClip) (GCPtr /*pGC */ ,
                         int /*type */ ,
-                        void */*pvalue */ ,
+                        void * /*pvalue */ ,
                         int /*nrects */ );
 
     void (*DestroyClip) (GCPtr /*pGC */ );
@@ -216,7 +216,7 @@ typedef struct _GCOps {
                            int /*y */ ,
                            unsigned int /*nglyph */ ,
                            CharInfoPtr * /*ppci */ ,
-                           void */*pglyphBase */ );
+                           void * /*pglyphBase */ );
 
     void (*PolyGlyphBlt) (DrawablePtr /*pDrawable */ ,
                           GCPtr /*pGC */ ,
@@ -224,7 +224,7 @@ typedef struct _GCOps {
                           int /*y */ ,
                           unsigned int /*nglyph */ ,
                           CharInfoPtr * /*ppci */ ,
-                          void */*pglyphBase */ );
+                          void * /*pglyphBase */ );
 
     void (*PushPixels) (GCPtr /*pGC */ ,
                         PixmapPtr /*pBitMap */ ,
diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h
index a23ce5c3f..fd3e209e5 100644
--- a/xorg-server/include/input.h
+++ b/xorg-server/include/input.h
@@ -316,7 +316,7 @@ extern _X_EXPORT Bool InitTouchClassDeviceStruct(DeviceIntPtr /*device */ ,
 
 typedef void (*BellProcPtr) (int /*percent */ ,
                              DeviceIntPtr /*device */ ,
-                             void */*ctrl */ ,
+                             void * /*ctrl */ ,
                              int);
 
 typedef void (*KbdCtrlProcPtr) (DeviceIntPtr /*device */ ,
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index 7bdb2fc85..eac227475 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -142,7 +142,7 @@ extern _X_EXPORT const char *ClientAuthorized(ClientPtr /*client */ ,
                                               char * /*auth_string */ );
 
 extern _X_EXPORT Bool EstablishNewConnections(ClientPtr /*clientUnused */ ,
-                                              void */*closure */ );
+                                              void * /*closure */ );
 
 extern _X_EXPORT void CheckConnections(void);
 
@@ -175,14 +175,14 @@ extern void ListenOnOpenFD(int /* fd */ , int /* noxauth */ );
 extern _X_EXPORT CARD32 GetTimeInMillis(void);
 extern _X_EXPORT CARD64 GetTimeInMicros(void);
 
-extern _X_EXPORT void AdjustWaitForDelay(void */*waitTime */ ,
+extern _X_EXPORT void AdjustWaitForDelay(void * /*waitTime */ ,
                                          unsigned long /*newdelay */ );
 
 typedef struct _OsTimerRec *OsTimerPtr;
 
 typedef CARD32 (*OsTimerCallback) (OsTimerPtr /* timer */ ,
                                    CARD32 /* time */ ,
-                                   void */* arg */ );
+                                   void * /* arg */ );
 
 extern _X_EXPORT void TimerInit(void);
 
@@ -195,7 +195,7 @@ extern _X_EXPORT OsTimerPtr TimerSet(OsTimerPtr /* timer */ ,
                                      int /* flags */ ,
                                      CARD32 /* millis */ ,
                                      OsTimerCallback /* func */ ,
-                                     void */* arg */ );
+                                     void * /* arg */ );
 
 extern _X_EXPORT void TimerCheck(void);
 extern _X_EXPORT void TimerCancel(OsTimerPtr /* pTimer */ );
@@ -214,7 +214,7 @@ extern _X_EXPORT void ProcessCommandLine(int /*argc */ , char * /*argv */ []);
 
 extern _X_EXPORT int set_font_authorizations(char ** /* authorizations */ ,
                                              int * /*authlen */ ,
-                                             void */* client */ );
+                                             void * /* client */ );
 
 #ifndef _HAVE_XALLOC_DECLS
 #define _HAVE_XALLOC_DECLS
@@ -397,14 +397,14 @@ ForEachHostInFamily(int /*family */ ,
                     Bool (* /*func */ )(
                                            unsigned char * /* addr */ ,
                                            short /* len */ ,
-                                           void */* closure */ ),
-                    void */*closure */ );
+                                           void * /* closure */ ),
+                    void * /*closure */ );
 
 extern _X_EXPORT int
 RemoveHost(ClientPtr /*client */ ,
            int /*family */ ,
            unsigned /*length */ ,
-           void */*pAddr */ );
+           void * /*pAddr */ );
 
 extern _X_EXPORT int
 GetHosts(void ** /*data */ ,
@@ -466,7 +466,7 @@ DefineSelf(int /*fd */ , const int /*protocol*/);
 
 #if XDMCP
 extern _X_EXPORT void
-AugmentSelf(void */*from */ , int /*len */ );
+AugmentSelf(void * /*from */ , int /*len */ );
 
 extern _X_EXPORT void
 RegisterAuthorizations(void);
diff --git a/xorg-server/include/pixmap.h b/xorg-server/include/pixmap.h
index 46ec3f5a2..12bb94fd1 100644
--- a/xorg-server/include/pixmap.h
+++ b/xorg-server/include/pixmap.h
@@ -99,7 +99,7 @@ extern _X_EXPORT PixmapPtr GetScratchPixmapHeader(ScreenPtr /*pScreen */ ,
                                                   int /*depth */ ,
                                                   int /*bitsPerPixel */ ,
                                                   int /*devKind */ ,
-                                                  void */*pPixData */ );
+                                                  void * /*pPixData */ );
 
 extern _X_EXPORT void FreeScratchPixmapHeader(PixmapPtr /*pPixmap */ );
 
diff --git a/xorg-server/include/property.h b/xorg-server/include/property.h
index 3b8ea8b2d..2e8b54f87 100644
--- a/xorg-server/include/property.h
+++ b/xorg-server/include/property.h
@@ -64,7 +64,7 @@ extern _X_EXPORT int dixChangeWindowProperty(ClientPtr /*pClient */ ,
                                              int /*format */ ,
                                              int /*mode */ ,
                                              unsigned long /*len */ ,
-                                             void */*value */ ,
+                                             void * /*value */ ,
                                              Bool /*sendevent */ );
 
 extern _X_EXPORT int ChangeWindowProperty(WindowPtr /*pWin */ ,
@@ -73,7 +73,7 @@ extern _X_EXPORT int ChangeWindowProperty(WindowPtr /*pWin */ ,
                                           int /*format */ ,
                                           int /*mode */ ,
                                           unsigned long /*len */ ,
-                                          void */*value */ ,
+                                          void * /*value */ ,
                                           Bool /*sendevent */ );
 
 extern _X_EXPORT int DeleteProperty(ClientPtr /*client */ ,
diff --git a/xorg-server/include/resource.h b/xorg-server/include/resource.h
index 7c9bf43df..ffe02a67e 100644
--- a/xorg-server/include/resource.h
+++ b/xorg-server/include/resource.h
@@ -139,21 +139,21 @@ typedef struct {
     void *value;
 } ResourceStateInfoRec;
 
-typedef int (*DeleteType) (void */*value */ ,
+typedef int (*DeleteType) (void * /*value */ ,
                            XID /*id */ );
 
-typedef void (*FindResType) (void */*value */ ,
+typedef void (*FindResType) (void * /*value */ ,
                              XID /*id */ ,
-                             void */*cdata */ );
+                             void * /*cdata */ );
 
-typedef void (*FindAllRes) (void */*value */ ,
+typedef void (*FindAllRes) (void * /*value */ ,
                             XID /*id */ ,
                             RESTYPE /*type */ ,
-                            void */*cdata */ );
+                            void * /*cdata */ );
 
-typedef Bool (*FindComplexResType) (void */*value */ ,
+typedef Bool (*FindComplexResType) (void * /*value */ ,
                                     XID /*id */ ,
-                                    void */*cdata */ );
+                                    void * /*cdata */ );
 
 /* Structure for estimating resource memory usage. Memory usage
  * consists of space allocated for the resource itself and of
@@ -169,16 +169,16 @@ typedef struct {
     unsigned long refCnt;
 } ResourceSizeRec, *ResourceSizePtr;
 
-typedef void (*SizeType)(void */*value*/,
+typedef void (*SizeType)(void * /*value*/,
                          XID /*id*/,
                          ResourceSizePtr /*size*/);
 
 extern _X_EXPORT RESTYPE CreateNewResourceType(DeleteType /*deleteFunc */ ,
                                                const char * /*name */ );
 
-typedef void (*FindTypeSubResources)(void */* value */,
+typedef void (*FindTypeSubResources)(void * /* value */,
                                      FindAllRes /* func */,
-                                     void */* cdata */);
+                                     void * /* cdata */);
 
 extern _X_EXPORT SizeType GetResourceTypeSizeFunc(
     RESTYPE /*type*/);
@@ -205,7 +205,7 @@ extern _X_EXPORT XID FakeClientID(int /*client */ );
 #endif
 extern _X_EXPORT Bool AddResource(XID /*id */ ,
                                   RESTYPE /*type */ ,
-                                  void */*value */ );
+                                  void * /*value */ );
 
 extern _X_EXPORT void FreeResource(XID /*id */ ,
                                    RESTYPE /*skipDeleteFuncType */ );
@@ -216,25 +216,25 @@ extern _X_EXPORT void FreeResourceByType(XID /*id */ ,
 
 extern _X_EXPORT Bool ChangeResourceValue(XID /*id */ ,
                                           RESTYPE /*rtype */ ,
-                                          void */*value */ );
+                                          void * /*value */ );
 
 extern _X_EXPORT void FindClientResourcesByType(ClientPtr /*client */ ,
                                                 RESTYPE /*type */ ,
                                                 FindResType /*func */ ,
-                                                void */*cdata */ );
+                                                void * /*cdata */ );
 
 extern _X_EXPORT void FindAllClientResources(ClientPtr /*client */ ,
                                              FindAllRes /*func */ ,
-                                             void */*cdata */ );
+                                             void * /*cdata */ );
 
 /** @brief Iterate through all subresources of a resource.
 
     @note The XID argument provided to the FindAllRes function
           may be 0 for subresources that don't have an XID */
-extern _X_EXPORT void FindSubResources(void */*resource*/,
+extern _X_EXPORT void FindSubResources(void * /*resource*/,
                                        RESTYPE /*type*/,
                                        FindAllRes /*func*/,
-                                       void */*cdata*/);
+                                       void * /*cdata*/);
 
 extern _X_EXPORT void FreeClientNeverRetainResources(ClientPtr /*client */ );
 
diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h
index 3dc499e7f..2ad029599 100644
--- a/xorg-server/include/scrnintstr.h
+++ b/xorg-server/include/scrnintstr.h
@@ -260,12 +260,12 @@ typedef void (*SendGraphicsExposeProcPtr) (ClientPtr /*client */ ,
                                            int /*minor */ );
 
 typedef void (*ScreenBlockHandlerProcPtr) (ScreenPtr /*pScreen*/ ,
-                                           void */*pTimeout */ ,
-                                           void */*pReadmask */ );
+                                           void * /*pTimeout */ ,
+                                           void * /*pReadmask */ );
 
 typedef void (*ScreenWakeupHandlerProcPtr) (ScreenPtr /*pScreen*/ ,
                                             unsigned long /*result */ ,
-                                            void */*pReadMask */ );
+                                            void * /*pReadMask */ );
 
 typedef Bool (*CreateScreenResourcesProcPtr) (ScreenPtr /*pScreen */ );
 
@@ -275,7 +275,7 @@ typedef Bool (*ModifyPixmapHeaderProcPtr) (PixmapPtr /*pPixmap */ ,
                                            int /*depth */ ,
                                            int /*bitsPerPixel */ ,
                                            int /*devKind */ ,
-                                           void */*pPixData */ );
+                                           void * /*pPixData */ );
 
 typedef PixmapPtr (*GetWindowPixmapProcPtr) (WindowPtr /*pWin */ );
 
diff --git a/xorg-server/include/window.h b/xorg-server/include/window.h
index b5a937eef..175ca5e31 100644
--- a/xorg-server/include/window.h
+++ b/xorg-server/include/window.h
@@ -73,15 +73,15 @@ typedef struct _BackingStore *BackingStorePtr;
 typedef struct _Window *WindowPtr;
 
 typedef int (*VisitWindowProcPtr) (WindowPtr /*pWin */ ,
-                                   void */*data */ );
+                                   void * /*data */ );
 
 extern _X_EXPORT int TraverseTree(WindowPtr /*pWin */ ,
                                   VisitWindowProcPtr /*func */ ,
-                                  void */*data */ );
+                                  void * /*data */ );
 
 extern _X_EXPORT int WalkTree(ScreenPtr /*pScreen */ ,
                               VisitWindowProcPtr /*func */ ,
-                              void */*data */ );
+                              void * /*data */ );
 
 extern _X_EXPORT Bool CreateRootWindow(ScreenPtr /*pScreen */ );
 
@@ -108,7 +108,7 @@ extern _X_EXPORT WindowPtr CreateWindow(Window /*wid */ ,
                                         VisualID /*visual */ ,
                                         int * /*error */ );
 
-extern _X_EXPORT int DeleteWindow(void */*pWin */ ,
+extern _X_EXPORT int DeleteWindow(void * /*pWin */ ,
                                   XID /*wid */ );
 
 extern _X_EXPORT int DestroySubwindows(WindowPtr /*pWin */ ,
diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h
index 0b9ca06d9..111b3fe6b 100644
--- a/xorg-server/include/xkbsrv.h
+++ b/xorg-server/include/xkbsrv.h
@@ -600,7 +600,7 @@ extern _X_EXPORT void XkbHandleBell(BOOL /* force */ ,
                                     BOOL /* eventOnly */ ,
                                     DeviceIntPtr /* kbd */ ,
                                     CARD8 /* percent */ ,
-                                    void */* ctrl */ ,
+                                    void * /* ctrl */ ,
                                     CARD8 /* class */ ,
                                     Atom /* name */ ,
                                     WindowPtr /* pWin */ ,