Merge branch 'sunweaver-pr/more-X-memory-macro-fixes' into 3.6.x

nx-X11/programs/Xserver/hw/nxagent/Clipboard.c

@@ -754,7 +754,7 @@ void nxagentCollectPropertyEvent(int resource)
 
         if (pszReturnData != NULL)
         {
-          free(pszReturnData);
+          XFree(pszReturnData);
         }
 
         return;
@@ -796,7 +796,7 @@ void nxagentCollectPropertyEvent(int resource)
 
         if (pszReturnData != NULL)
         {
-          free(pszReturnData);
+          XFree(pszReturnData);
         }
 
         return;
@@ -974,7 +974,7 @@ void nxagentNotifySelection(XEvent *X)
           }
 
           /*
-           * free(pszReturnData);
+           * XFree(pszReturnData);
            * pszReturnData=NULL;
            */
 

nx-X11/programs/Xserver/hw/nxagent/compext/Bitmap.c

@@ -73,7 +73,7 @@ char *BitmapCompressData(XImage *image, unsigned int *size)
 
     *size = image -> width * image -> height * 3;
 
-    data = Xmalloc(*size);
+    data = malloc(*size);
 
     if (data == NULL)
     {

nx-X11/programs/Xserver/hw/nxagent/compext/Compext.h

@@ -39,13 +39,6 @@ extern "C" {
 #include <nx/NXvars.h>
 
 /*
- * All the NX code should use these.
- */
-
-#define Xmalloc(size) malloc((size))
-#define Xfree(ptr)    free((ptr))
-
-/*
  * Maximum number of supported pack methods.
  */
 

nx-X11/programs/Xserver/hw/nxagent/compext/Z.c

@@ -67,7 +67,7 @@ char *ZCompressData(const char *plainData, unsigned int plainSize, int threshold
 
   *compressedSize = plainSize + (plainSize / 1000) + 12 + 1;
 
-  compressedData = Xmalloc(*compressedSize);
+  compressedData = malloc(*compressedSize);
 
   if (compressedData == NULL)
   {
@@ -129,7 +129,7 @@ char *ZCompressData(const char *plainData, unsigned int plainSize, int threshold
                   plainSize, zError(result));
       #endif
 
-      Xfree(compressedData);
+      free(compressedData);
 
       *compressedSize = 0;
 
@@ -245,7 +245,7 @@ int ZInitEncoder()
   {
     int result;
 
-    zStream = Xmalloc(sizeof(z_stream));
+    zStream = malloc(sizeof(z_stream));
 
     if (zStream == NULL)
     {
@@ -300,7 +300,7 @@ int ZResetEncoder()
       #endif
     }
 
-    Xfree(zStream);
+    free(zStream);
   }
 
   zInitialized = 0;