From acf87144d019f18e646501657d9082c6eba77f54 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sun, 26 Jun 2016 01:38:22 +0200
Subject: nx-X11/programs/Xserver: Drop {X,x}free() macros, use free() instead.

Fixes ArcticaProject/nx-libs#105
---
 nx-X11/programs/Xserver/xkb/ddxList.c |  8 ++++----
 nx-X11/programs/Xserver/xkb/ddxLoad.c | 12 ++++++------
 nx-X11/programs/Xserver/xkb/xkb.c     | 14 +++++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'nx-X11/programs/Xserver/xkb')

diff --git a/nx-X11/programs/Xserver/xkb/ddxList.c b/nx-X11/programs/Xserver/xkb/ddxList.c
index 3dfb85644..2b8f90bad 100644
--- a/nx-X11/programs/Xserver/xkb/ddxList.c
+++ b/nx-X11/programs/Xserver/xkb/ddxList.c
@@ -169,7 +169,7 @@ char	tmpname[PATH_MAX];
 	if ((list->pattern[what][0]=='*')&&(list->pattern[what][1]=='\0')) {
 	    buf = Xprintf("%s/%s.dir",XkbBaseDirectory,componentDirs[what]);
 	    in= fopen(buf,"r");
-	    xfree (buf);
+	    free (buf);
 	    buf = NULL;
 	}
 	if (!in) {
@@ -186,7 +186,7 @@ char	tmpname[PATH_MAX];
 	if ((list->pattern[what][0]=='*')&&(list->pattern[what][1]=='\0')) {
 	    buf = Xprintf("%s.dir",componentDirs[what]);
 	    in= fopen(buf,"r");
-	    xfree (buf);
+	    free (buf);
 	    buf = NULL;
 	}
 	if (!in) {
@@ -217,7 +217,7 @@ char	tmpname[PATH_MAX];
     if (!in)
     {
         if (buf != NULL)
-	    xfree (buf);
+	    free (buf);
 #ifdef WIN32
 	unlink(tmpname);
 #endif
@@ -277,7 +277,7 @@ char	tmpname[PATH_MAX];
     unlink(tmpname);
 #endif
     if (buf != NULL)
-        xfree (buf);
+        free (buf);
     return status;
 }
 
diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c
index b3ef60f22..9134e4754 100644
--- a/nx-X11/programs/Xserver/xkb/ddxLoad.c
+++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c
@@ -151,7 +151,7 @@ Win32System(const char *cmdline)
 	    LocalFree(buffer);
 	}
 
-	xfree(cmd);
+	free(cmd);
 	return -1;
     }
     /* Wait until child process exits. */
@@ -162,7 +162,7 @@ Win32System(const char *cmdline)
     /* Close process and thread handles. */
     CloseHandle( pi.hProcess );
     CloseHandle( pi.hThread );
-    xfree(cmd);
+    free(cmd);
 
     return dwExitCode;
 }
@@ -620,7 +620,7 @@ char 	*cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile;
 	if (outFile!=NULL)
 	    _XkbFree(outFile);
         if (cmd!=NULL)
-            xfree(cmd);
+            free(cmd);
 	return True;
     } 
 #ifdef DEBUG
@@ -629,7 +629,7 @@ char 	*cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile;
     if (outFile!=NULL)
 	_XkbFree(outFile);
     if (cmd!=NULL)
-        xfree(cmd);
+        free(cmd);
     return False;
 }
 
@@ -802,7 +802,7 @@ char tmpname[PATH_MAX];
 	    }
 #endif
             if (buf != NULL)
-                xfree (buf);
+                free (buf);
 	    return True;
 	}
 #ifdef DEBUG
@@ -826,7 +826,7 @@ char tmpname[PATH_MAX];
     if (nameRtrn)
 	nameRtrn[0]= '\0';
     if (buf != NULL)
-        xfree (buf);
+        free (buf);
     return False;
 }
 
diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c
index 20aab8ef0..7085fbfe4 100644
--- a/nx-X11/programs/Xserver/xkb/xkb.c
+++ b/nx-X11/programs/Xserver/xkb/xkb.c
@@ -4823,16 +4823,16 @@ char *		wire;
 	    return status;
 	status = _GetCountedString(&wire, client, &val);
 	if (status != Success) {
-            xfree(name);
+            free(name);
             return status;
         }
 	if (XkbAddGeomProperty(geom,name,val)==NULL) {
-            xfree(name);
-            xfree(val);
+            free(name);
+            free(val);
 	    return BadAlloc;
         }
-        xfree(name);
-        xfree(val);
+        free(name);
+        free(val);
     }
 
     if (req->nColors<2) {
@@ -4860,10 +4860,10 @@ char *		wire;
 	if (status != Success)
 	    return status;
         if (!XkbAddGeomColor(geom,name,geom->num_colors)) {
-            xfree(name);
+            free(name);
 	    return BadAlloc;
         }
-        xfree(name);
+        free(name);
     }
     if (req->nColors!=geom->num_colors) {
 	client->errorValue= _XkbErrCode3(0x05,req->nColors,geom->num_colors);
-- 
cgit v1.2.3