aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Font.c
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Font.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Font.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c
index 8f692eb85..22b3e6c88 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Font.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c
@@ -196,11 +196,11 @@ void nxagentFreeFontCache(void)
nxagentFreeFont(CACHE_FSTRUCT(i));
}
- xfree(CACHE_NAME(i));
- xfree(CACHE_ENTRY(i));
+ free(CACHE_NAME(i));
+ free(CACHE_ENTRY(i));
}
- xfree(CACHE_ENTRY_PTR);
+ free(CACHE_ENTRY_PTR);
CACHE_ENTRY_PTR = NULL;
CACHE_INDEX = 0;
CACHE_SIZE = 0;
@@ -364,10 +364,10 @@ static void nxagentFreeRemoteFontList(nxagentFontList *listRec)
{
if (listRec -> list[l])
{
- xfree(listRec -> list[l] -> name);
+ free(listRec -> list[l] -> name);
listRec -> list[l] -> name = NULL;
- xfree(listRec -> list[l]);
+ free(listRec -> list[l]);
listRec -> list[l] = NULL;
}
}
@@ -686,7 +686,7 @@ Bool nxagentUnrealizeFont(ScreenPtr pScreen, FontPtr pFont)
if (nxagentFontPriv(pFont) -> mirrorID)
FreeResource(nxagentFontPriv(pFont) -> mirrorID, RT_NONE);
- xfree(nxagentFontPriv(pFont));
+ free(nxagentFontPriv(pFont));
FontSetPrivate(pFont, nxagentFontPrivateIndex, NULL);
}
@@ -1640,7 +1640,7 @@ XFontStruct* nxagentLoadQueryFont(register Display *dpy, char *name, FontPtr pFo
fprintf(stderr, "nxagentLoadQueryFont: WARNING! Font not found '%s'.\n", name);
#endif
- Xfree(fs);
+ free(fs);
return (XFontStruct *) NULL;
}
@@ -1674,7 +1674,7 @@ XFontStruct* nxagentLoadQueryFont(register Display *dpy, char *name, FontPtr pFo
fprintf(stderr, "nxagentLoadQueryFont: WARNING! Failed allocation of XFontProp.");
#endif
- Xfree((char *) fs);
+ free((char *) fs);
return (XFontStruct *) NULL;
}
@@ -1714,13 +1714,13 @@ int nxagentFreeFont(XFontStruct *fs)
#ifdef USE_XF86BIGFONT
_XF86BigfontFreeFontMetrics(fs);
#else
- Xfree ((char *) fs->per_char);
+ free ((char *) fs->per_char);
#endif
}
if (fs -> properties)
{
- Xfree (fs->properties);
+ free (fs->properties);
}
XFree(fs);