diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-27 06:40:50 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-27 06:40:50 +0000 |
| commit | 619d6f3626f36af85cc40eeee95c7585d906fe5c (patch) | |
| tree | 0428401464cc6127a651c94261678072cb3bafc3 /xorg-server/Xext | |
| parent | d89c0289565a662a378df6e3c05de42982ab1c9d (diff) | |
| parent | 80cb6bca9f771ef15c00cc41af2b9f315d66258d (diff) | |
| download | vcxsrv-619d6f3626f36af85cc40eeee95c7585d906fe5c.tar.gz vcxsrv-619d6f3626f36af85cc40eeee95c7585d906fe5c.tar.bz2 vcxsrv-619d6f3626f36af85cc40eeee95c7585d906fe5c.zip | |
svn merge ^/branches/released .
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)
|