diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-27 06:18:40 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-27 06:18:40 +0000 |
| commit | 80cb6bca9f771ef15c00cc41af2b9f315d66258d (patch) | |
| tree | 3e011c7a2ef76372082dcba8d8cb6c9bd942b89f /xorg-server/Xext | |
| parent | fade1b113f18f3fd26c3c01ca4543effa80b9b62 (diff) | |
| download | vcxsrv-80cb6bca9f771ef15c00cc41af2b9f315d66258d.tar.gz vcxsrv-80cb6bca9f771ef15c00cc41af2b9f315d66258d.tar.bz2 vcxsrv-80cb6bca9f771ef15c00cc41af2b9f315d66258d.zip | |
xserver git update 27/5/2010
Diffstat (limited to 'xorg-server/Xext')
| -rw-r--r-- | xorg-server/Xext/xf86bigfont.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/xorg-server/Xext/xf86bigfont.c b/xorg-server/Xext/xf86bigfont.c index 8d7071507..2f0875faa 100644 --- a/xorg-server/Xext/xf86bigfont.c +++ b/xorg-server/Xext/xf86bigfont.c @@ -404,7 +404,7 @@ ProcXF86BigfontQueryFont( int nCharInfos;
int shmid;
#ifdef HAS_SHM
- ShmDescPtr pDesc;
+ ShmDescPtr pDesc = NULL;
#else
#define pDesc 0
#endif
@@ -449,8 +449,6 @@ ProcXF86BigfontQueryFont( #ifdef HAS_SHM
if (!badSysCall)
pDesc = (ShmDescPtr) FontGetPrivate(pFont, FontShmdescIndex);
- else
- pDesc = NULL;
if (pDesc) {
pCI = (xCharInfo *) pDesc->attach_addr;
if (stuff_flags & XF86Bigfont_FLAGS_Shm)
|