aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Display.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-26 01:38:22 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-02 14:05:30 +0200
commitacf87144d019f18e646501657d9082c6eba77f54 (patch)
treedadb838cd54010836230358a4a5805bb0696b5bb /nx-X11/programs/Xserver/hw/nxagent/Display.c
parent279d37127db241a9ee685f6b671f51aa21a972ea (diff)
downloadnx-libs-acf87144d019f18e646501657d9082c6eba77f54.tar.gz
nx-libs-acf87144d019f18e646501657d9082c6eba77f54.tar.bz2
nx-libs-acf87144d019f18e646501657d9082c6eba77f54.zip
nx-X11/programs/Xserver: Drop {X,x}free() macros, use free() instead.
Fixes ArcticaProject/nx-libs#105
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Display.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Display.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index 31ea7c2a0..27cd0859a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -1814,13 +1814,13 @@ void nxagentCloseDisplay()
* traffic
*/
- xfree(nxagentDefaultColormaps);
+ free(nxagentDefaultColormaps);
nxagentDefaultColormaps = NULL;
XFree(nxagentVisuals);
nxagentVisuals = NULL;
- xfree(nxagentDepths);
+ free(nxagentDepths);
nxagentDepths = NULL;
XFree(nxagentPixmapFormats);
@@ -2060,7 +2060,7 @@ void nxagentBackupDisplayInfo(void)
nxagentNumVisualsRecBackup = nxagentNumVisuals;
if (nxagentVisualHasBeenIgnored)
{
- xfree(nxagentVisualHasBeenIgnored);
+ free(nxagentVisualHasBeenIgnored);
nxagentVisualHasBeenIgnored = NULL;
}
nxagentVisualHasBeenIgnored = xalloc(nxagentNumVisuals * sizeof(Bool));
@@ -2074,17 +2074,17 @@ void nxagentBackupDisplayInfo(void)
void nxagentCleanupBackupDisplayInfo(void)
{
- xfree(nxagentDepthsRecBackup);
+ free(nxagentDepthsRecBackup);
nxagentNumDepthsRecBackup = 0;
nxagentNumDefaultColormapsRecBackup = 0;
- xfree(nxagentVisualsRecBackup);
+ free(nxagentVisualsRecBackup);
nxagentNumVisualsRecBackup = 0;
if (nxagentVisualHasBeenIgnored)
{
- xfree(nxagentVisualHasBeenIgnored);
+ free(nxagentVisualHasBeenIgnored);
nxagentVisualHasBeenIgnored = NULL;
}
@@ -2107,7 +2107,7 @@ void nxagentCleanupBackupDisplayInfo(void)
}
else
{
- xfree(nxagentBitmapGCBackup);
+ free(nxagentBitmapGCBackup);
}
nxagentBitmapGCBackup = NULL;