xserver: Branch 'master'

[GitLab Mirror]

 include/screenint.h |   17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

New commits:
commit 52451f1f89890e3088c6fd9d7da0708fd9263950
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Sep 5 12:10:20 2018 -0400

    dix: De-ugly the prototype for Add{GPU,}Screen

diff --git a/include/screenint.h b/include/screenint.h
index e38384873..0a4527832 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -54,20 +54,9 @@ typedef struct _Visual *VisualPtr;
 typedef struct _Depth *DepthPtr;
 typedef struct _Screen *ScreenPtr;
 
-extern _X_EXPORT int AddScreen(Bool (* /*pfnInit */ )(
-                                                         ScreenPtr /*pScreen */
-                                                         ,
-                                                         int /*argc */ ,
-                                                         char ** /*argv */ ),
-                               int /*argc */ ,
-                               char ** /*argv */ );
-
-
-extern _X_EXPORT int AddGPUScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ ,
-                                                   int /*argc */ ,
-                                                   char **      /*argv */
-                                                   ),
-                                  int argc, char **argv);
+typedef Bool (*ScreenInitProcPtr)(ScreenPtr pScreen, int argc, char **argv);
+extern _X_EXPORT int AddScreen(ScreenInitProcPtr pfnInit, int argc, char **argv);
+extern _X_EXPORT int AddGPUScreen(ScreenInitProcPtr pfnInit, int argc, char **argv);
 
 extern _X_EXPORT void RemoveGPUScreen(ScreenPtr pScreen);