diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:03:52 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:03:52 +0100 |
| commit | edce25213ffc81389909c827c9aaac27b736b483 (patch) | |
| tree | a97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/hw/nxagent/Font.c | |
| parent | e9f44221b2520a1d894b3c125269b5d10438453b (diff) | |
| parent | 68dd0b52e13c844d662192654fb10cb993257a59 (diff) | |
| download | nx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.gz nx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.bz2 nx-libs-edce25213ffc81389909c827c9aaac27b736b483.zip | |
Merge branch 'sunweaver-pr/change-pointer-into-void' into 3.6.x
Attributes GH PR #54: https://github.com/ArcticaProject/nx-libs/pull/54
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Font.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Font.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index 5becb2cff..9123f4bbe 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -103,7 +103,7 @@ is" without express or implied warranty. static int reconnectFlexibility; static void nxagentCleanCacheAfterReconnect(void); -static void nxagentFontReconnect(FontPtr, XID, pointer); +static void nxagentFontReconnect(FontPtr, XID, void *); static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontPtr pFont); static XFontStruct *nxagentLoadQueryFont(register Display *dpy , char *fontName , FontPtr pFont); int nxagentFreeFont(XFontStruct *fs); @@ -486,7 +486,7 @@ Bool nxagentFontLookUp(const char *name) Bool nxagentRealizeFont(ScreenPtr pScreen, FontPtr pFont) { - pointer priv; + void * priv; Atom name_atom, value_atom; int nprops; FontPropPtr props; @@ -538,7 +538,7 @@ Bool nxagentRealizeFont(ScreenPtr pScreen, FontPtr pFont) name = origName; } - priv = (pointer)xalloc(sizeof(nxagentPrivFont)); + priv = (void *)xalloc(sizeof(nxagentPrivFont)); FontSetPrivate(pFont, nxagentFontPrivateIndex, priv); nxagentFontPriv(pFont) -> mirrorID = 0; @@ -693,7 +693,7 @@ Bool nxagentUnrealizeFont(ScreenPtr pScreen, FontPtr pFont) return True; } -int nxagentDestroyNewFontResourceType(pointer p, XID id) +int nxagentDestroyNewFontResourceType(void * p, XID id) { #ifdef TEST fprintf(stderr, "nxagentDestroyNewFontResourceType: Destroying mirror id [%ld] for font at [%p].\n", @@ -858,7 +858,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP return fontStruct; } -static void nxagentFontDisconnect(FontPtr pFont, XID param1, pointer param2) +static void nxagentFontDisconnect(FontPtr pFont, XID param1, void * param2) { nxagentPrivFont *privFont; Bool *pBool = (Bool*)param2; @@ -959,7 +959,7 @@ static void nxagentCollectFailedFont(FontPtr fpt, XID id) nxagentFailedToReconnectFonts.index++; } -static void nxagentFontReconnect(FontPtr pFont, XID param1, pointer param2) +static void nxagentFontReconnect(FontPtr pFont, XID param1, void * param2) { int i; nxagentPrivFont *privFont; @@ -1164,7 +1164,7 @@ Bool nxagentReconnectAllFonts(void *p0) return fontSuccess; } -static void nxagentFailedFontReconnect(FontPtr pFont, XID param1, pointer param2) +static void nxagentFailedFontReconnect(FontPtr pFont, XID param1, void * param2) { int i; nxagentPrivFont *privFont; |