[PATCH 00/37] Warning fixes (post 1.15 proposed changes)

[Colin Harrison]

PS

Also some protos don't now work, for me, when compiling xserver now we have
lost the 'pointer' type....

--- save_Xdefs.h        2013-07-08 16:18:17.466538543 +0100
+++ Xdefs.h     2014-01-13 17:13:09.440775586 +0000
@@ -101,8 +101,8 @@ typedef FSID AccContext;
 typedef struct timeval **OSTimePtr;


-typedef void (* BlockHandlerProcPtr)(pointer /* blockData */,
+typedef void (* BlockHandlerProcPtr)(void */* blockData */,
                                     OSTimePtr /* pTimeout */,
-                                    pointer /* pReadmask */);
+                                    void */* pReadmask */);

 #endif

And

--- save_fontproto.h    2013-07-08 16:18:30.594626285 +0100
+++ fontproto.h 2014-01-13 17:26:10.670117716 +0000
@@ -74,7 +74,7 @@ extern FontPtr  CreateFontRec (void);
 extern void  DestroyFontRec (FontPtr font);
 extern Bool     _FontSetNewPrivate (FontPtr        /* pFont */,
                                    int            /* n */,
-                                   pointer        /* ptr */);
+                                   void *         /* ptr */);
 extern int      AllocateFontPrivateIndex (void);
 extern void ResetFontPrivateIndex (void);

And

--- save_fontstruct.h   2013-07-08 16:18:30.594626285 +0100
+++ fontstruct.h        2014-01-13 17:24:10.801288612 +0000
@@ -122,11 +122,11 @@ typedef struct _Font {
     void        (*unload_font) (FontPtr         /* font */);
     void        (*unload_glyphs) (FontPtr         /* font */);
     FontPathElementPtr fpe;
-    pointer     svrPrivate;
-    pointer     fontPrivate;
-    pointer     fpePrivate;
+    void *      svrPrivate;
+    void *      fontPrivate;
+    void *      fpePrivate;
     int                maxPrivate;
-    pointer    *devPrivates;
+    void *     *devPrivates;
 }           FontRec;

 #define FontGetPrivate(pFont,n) ((n) > (pFont)->maxPrivate ? (pointer) 0 :
\
@@ -149,14 +149,14 @@ typedef struct _FontPathElement {
     char       *name;
     int         type;
     int         refcount;
-    pointer     private;
+    void *      private;
 }           FontPathElementRec;

 typedef Bool (*NameCheckFunc) (char *name);
 typedef int (*InitFpeFunc) (FontPathElementPtr fpe);
 typedef int (*FreeFpeFunc) (FontPathElementPtr fpe);
 typedef int (*ResetFpeFunc) (FontPathElementPtr fpe);
-typedef int (*OpenFontFunc) ( pointer client,
+typedef int (*OpenFontFunc) ( void * client,
                              FontPathElementPtr fpe,
                              Mask flags,
                              char* name,
@@ -168,55 +168,55 @@ typedef int (*OpenFontFunc) ( pointer cl
                              char** aliasName,
                              FontPtr non_cachable_font);
 typedef void (*CloseFontFunc) (FontPathElementPtr fpe, FontPtr pFont);
-typedef int (*ListFontsFunc) (pointer client,
+typedef int (*ListFontsFunc) (void * client,
                              FontPathElementPtr fpe,
                              char* pat,
                              int len,
                              int max,
                              FontNamesPtr names);

-typedef int (*StartLfwiFunc) (pointer client,
+typedef int (*StartLfwiFunc) (void * client,
                              FontPathElementPtr fpe,
                              char* pat,
                              int len,
                              int max,
-                             pointer* privatep);
+                             void** privatep);

-typedef int (*NextLfwiFunc) (pointer client,
+typedef int (*NextLfwiFunc) (void * client,
                             FontPathElementPtr fpe,
                             char** name,
                             int* namelen,
                             FontInfoPtr* info,
                             int* numFonts,
-                            pointer private);
+                            void * private);

 typedef int (*WakeupFpeFunc) (FontPathElementPtr fpe,
                              unsigned long* LastSelectMask);

-typedef void (*ClientDiedFunc) (pointer client,
+typedef void (*ClientDiedFunc) (void * client,
                               FontPathElementPtr fpe);

-typedef int (*LoadGlyphsFunc) (pointer client,
+typedef int (*LoadGlyphsFunc) (void * client,
                               FontPtr pfont,
                               Bool range_flag,
                               unsigned int nchars,
                               int item_size,
                               unsigned char* data);

-typedef int (*StartLaFunc) (pointer client,
+typedef int (*StartLaFunc) (void * client,
                            FontPathElementPtr fpe,
                            char* pat,
                            int len,
                            int max,
-                           pointer* privatep);
+                           void** privatep);

-typedef int (*NextLaFunc) (pointer client,
+typedef int (*NextLaFunc) (void * client,
                           FontPathElementPtr fpe,
                           char** namep,
                           int* namelenp,
                           char** resolvedp,
                           int* resolvedlenp,
-                          pointer private);
+                          void * private);

 typedef void (*SetPathFunc)(void);


I've not had any problems elsewhere after applying these changes.

Thanks,
Colin Harrison