Merge branch 'sunweaver-pr/change-pointer-into-void' into 3.6.x

Attributes GH PR #54: https://github.com/ArcticaProject/nx-libs/pull/54

4 files changed, 10 insertions, 10 deletions

diff --git a/nx-X11/programs/Xserver/GL/glx/glxcmds.c b/nx-X11/programs/Xserver/GL/glx/glxcmds.c
index a1bb25975..c62585507 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxcmds.c
+++ b/nx-X11/programs/Xserver/GL/glx/glxcmds.c
@@ -229,7 +229,7 @@ int DoCreateContext(__GLXclientState *cl, GLXContextID gcId,
     /*
     ** Register this context as a resource.
     */
-    if (!AddResource(gcId, __glXContextRes, (pointer)glxc)) {
+    if (!AddResource(gcId, __glXContextRes, (void *)glxc)) {
 	if (!isDirect) {
 	    (*glxc->gc->exports.destroyContext)((__GLcontext *)glxc->gc);
         }
@@ -1760,7 +1760,7 @@ static int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc)
             if (ret == Success) {
                 if (barrier)
                     /* add source for cleanup when drawable is gone */
-                    AddResource(drawable, __glXSwapBarrierRes, (pointer)screen);
+                    AddResource(drawable, __glXSwapBarrierRes, (void *)screen);
                 else
                     /* delete source */
                     FreeResourceByType(drawable, __glXSwapBarrierRes, FALSE);
diff --git a/nx-X11/programs/Xserver/GL/glx/glxext.c b/nx-X11/programs/Xserver/GL/glx/glxext.c
index fa1382983..e7ed3975c 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxext.c
+++ b/nx-X11/programs/Xserver/GL/glx/glxext.c
@@ -417,7 +417,7 @@ static int __glXDispatch(ClientPtr client)
 	** with the client so we will be notified when the client dies.
 	*/
 	XID xid = FakeClientID(client->index);
-	if (!AddResource( xid, __glXClientRes, (pointer)(long)client->index)) {
+	if (!AddResource( xid, __glXClientRes, (void *)(long)client->index)) {
 	    return BadAlloc;
 	}
 	ResetClientState(client->index);
@@ -471,7 +471,7 @@ static int __glXSwapDispatch(ClientPtr client)
 	** with the client so we will be notified when the client dies.
 	*/
 	XID xid = FakeClientID(client->index);
-	if (!AddResource( xid, __glXClientRes, (pointer)(long)client->index)) {
+	if (!AddResource( xid, __glXClientRes, (void *)(long)client->index)) {
 	    return BadAlloc;
 	}
 	ResetClientState(client->index);
diff --git a/nx-X11/programs/Xserver/GL/glxmodule.c b/nx-X11/programs/Xserver/GL/glxmodule.c
index f8c03913e..b97b7ef8a 100644
--- a/nx-X11/programs/Xserver/GL/glxmodule.c
+++ b/nx-X11/programs/Xserver/GL/glxmodule.c
@@ -1236,11 +1236,11 @@ static XF86ModuleVersionInfo VersRec =
 
 XF86ModuleData glxModuleData = { &VersRec, glxSetup, NULL };
 
-static pointer
-glxSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+static void *
+glxSetup(void * module, void * opts, int *errmaj, int *errmin)
 {
     static Bool setupDone = FALSE;
-    pointer GLcore  = NULL;
+    void * GLcore  = NULL;
 #ifdef GLX_USE_SGI_SI
     char GLcoreName[] = "GL";
 #else
diff --git a/nx-X11/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c b/nx-X11/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c
index 4e03b59fe..e0bbd193d 100644
--- a/nx-X11/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c
+++ b/nx-X11/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c
@@ -56,9 +56,9 @@ static XF86ModuleVersionInfo VersRec =
 
 XF86ModuleData GLcoreModuleData = { &VersRec, GLcoreSetup, NULL };
 
-static pointer
-GLcoreSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+static void *
+GLcoreSetup(void * module, void * opts, int *errmaj, int *errmin)
 {
     /* Need a non-NULL return value to indicate success */
-    return (pointer)1;
+    return (void *)1;
 }