diff options
author | marha <marha@users.sourceforge.net> | 2011-03-30 20:51:05 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-03-30 20:51:05 +0000 |
commit | 70a13fe295183aeea369adcb94f2d67e69fab387 (patch) | |
tree | d707644ab424d0517a879b9784a543a899e1ae20 /xorg-server/glx/xfont.c | |
parent | 9b51ee5bcf948185cfcba0600b3da2d241339174 (diff) | |
parent | 140242b0d4aed1d595d6565d088d9567c456d6b4 (diff) | |
download | vcxsrv-70a13fe295183aeea369adcb94f2d67e69fab387.tar.gz vcxsrv-70a13fe295183aeea369adcb94f2d67e69fab387.tar.bz2 vcxsrv-70a13fe295183aeea369adcb94f2d67e69fab387.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/glx/xfont.c')
-rw-r--r-- | xorg-server/glx/xfont.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/glx/xfont.c b/xorg-server/glx/xfont.c index 393c2a2a0..dde0d14b5 100644 --- a/xorg-server/glx/xfont.c +++ b/xorg-server/glx/xfont.c @@ -155,7 +155,7 @@ int __glXDisp_UseXFont(__GLXclientState *cl, GLbyte *pc) xGLXUseXFontReq *req; FontPtr pFont; GLuint currentListIndex; - struct glx_context *cx; + __GLXcontext *cx; int error; REQUEST_SIZE_MATCH(xGLXUseXFontReq); |