Drop glx_ansic.h wrapper and call malloc, realloc, free and str-funcs directly.

 commit 2d2d38d17cc2558f8a41166a4a1578bc4c663c37
 Author: Kristian Høgsberg <krh@redhat.com>
 Date:   Fri Mar 17 01:47:25 2006 +0000

        Check for glproto when building GLX and make sure we have at least 1.4.6.
        Drop glx_ansic.h wrapper and call xalloc, xrealloc, xfree and str-funcs
            directly.

     We don't check the glproto version as we know what it is (we have our own proto file).

     Furthermore, we skip the switch from --glX<func> -> x<func> and directly switch to
     <func> (e.g. __glXMalloc() -> malloc()).

     Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

1 files changed, 11 insertions, 11 deletions

diff --git a/nx-X11/programs/Xserver/GL/glx/glxscreens.c b/nx-X11/programs/Xserver/GL/glx/glxscreens.c
index 6b274a64b..1bff4bc3a 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxscreens.c
+++ b/nx-X11/programs/Xserver/GL/glx/glxscreens.c
@@ -288,7 +288,7 @@ static void wrapPositionWindow(int screen)
 void __glXHyperpipeInit(int screen, __GLXHyperpipeExtensionFuncs *funcs)
 {
     if (__glXNumHyperpipeFuncs < screen + 1) {
-        __glXHyperpipeFuncs = __glXRealloc(__glXHyperpipeFuncs,
+        __glXHyperpipeFuncs = realloc(__glXHyperpipeFuncs,
                                            (screen+1) * sizeof(__GLXHyperpipeExtensionFuncs));
         __glXNumHyperpipeFuncs = screen + 1;
     }
@@ -306,7 +306,7 @@ void __glXHyperpipeInit(int screen, __GLXHyperpipeExtensionFuncs *funcs)
 void __glXSwapBarrierInit(int screen, __GLXSwapBarrierExtensionFuncs *funcs)
 {
     if (__glXNumSwapBarrierFuncs < screen + 1) {
-        __glXSwapBarrierFuncs = __glXRealloc(__glXSwapBarrierFuncs,
+        __glXSwapBarrierFuncs = realloc(__glXSwapBarrierFuncs,
                                            (screen+1) * sizeof(__GLXSwapBarrierExtensionFuncs));
         __glXNumSwapBarrierFuncs = screen + 1;
     }
@@ -327,7 +327,7 @@ void __glXScreenInit(GLint numscreens)
     ** This alloc has to work or else the server might as well core dump.
     */
     __glXActiveScreens =
-      (__GLXscreenInfo *) __glXMalloc(sizeof(__GLXscreenInfo) * numscreens);
+      (__GLXscreenInfo *) malloc(sizeof(__GLXscreenInfo) * numscreens);
     
     for (i=0; i < numscreens; i++) {
 	/*
@@ -338,10 +338,10 @@ void __glXScreenInit(GLint numscreens)
 		__glXActiveScreens[i] = *__glXScreens[j];
 
 		__glXActiveScreens[i].numUsableVisuals = __glXActiveScreens[i].numVisuals;
-		__glXActiveScreens[i].GLextensions = __glXStrdup(GLServerExtensions);
-		__glXActiveScreens[i].GLXvendor = __glXStrdup(GLXServerVendorName);
-		__glXActiveScreens[i].GLXversion = __glXStrdup(GLXServerVersion);
-		__glXActiveScreens[i].GLXextensions = __glXStrdup(GLXServerExtensions);
+		__glXActiveScreens[i].GLextensions = strdup(GLServerExtensions);
+		__glXActiveScreens[i].GLXvendor = strdup(GLXServerVendorName);
+		__glXActiveScreens[i].GLXversion = strdup(GLXServerVersion);
+		__glXActiveScreens[i].GLXextensions = strdup(GLXServerExtensions);
 
 		__glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone);
 		wrapPositionWindow(i);
@@ -356,10 +356,10 @@ void __glXScreenReset(void)
   int i;
 
   for (i = 0; i < __glXNumActiveScreens; i++) {
-      __glXFree(__glXActiveScreens[i].GLXvendor);
-      __glXFree(__glXActiveScreens[i].GLXversion);
-      __glXFree(__glXActiveScreens[i].GLXextensions);
-      __glXFree(__glXActiveScreens[i].GLextensions);
+      free(__glXActiveScreens[i].GLXvendor);
+      free(__glXActiveScreens[i].GLXversion);
+      free(__glXActiveScreens[i].GLXextensions);
+      free(__glXActiveScreens[i].GLextensions);
   }
   free(__glXActiveScreens);
   free(__glXHyperpipeFuncs);