diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-03-07 09:03:46 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2007-03-07 09:03:46 -0500 |
| commit | bb111291d854b4329e47367ce3c67e8a2785e6e9 (patch) | |
| tree | 24d65b1e029549c13d151d4d6c862bb229b0500f /mfb | |
| parent | 74175e0af74c530cb712a6772d3c5d61d1be9748 (diff) | |
| parent | e9bfb2b3d7dfaafd90d2ad0fa3d0e1acced4380b (diff) | |
Merge branch 'master' into XACE-SELINUX
Diffstat (limited to 'mfb')
| -rw-r--r-- | mfb/mfbpixmap.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mfb/mfbpixmap.c b/mfb/mfbpixmap.c index 5ec8502cb..e34972451 100644 --- a/mfb/mfbpixmap.c +++ b/mfb/mfbpixmap.c @@ -101,12 +101,8 @@ mfbCreatePixmap (pScreen, width, height, depth) pPixmap->drawable.height = height; pPixmap->devKind = paddedWidth; pPixmap->refcnt = 1; -#ifdef PIXPRIV pPixmap->devPrivate.ptr = datasize ? (pointer)((char *)pPixmap + pScreen->totalPixmapSize) : NULL; -#else - pPixmap->devPrivate.ptr = (pointer)(pPixmap + 1); -#endif return pPixmap; } |