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 /dix/privates.c | |
| parent | 74175e0af74c530cb712a6772d3c5d61d1be9748 (diff) | |
| parent | e9bfb2b3d7dfaafd90d2ad0fa3d0e1acced4380b (diff) | |
Merge branch 'master' into XACE-SELINUX
Diffstat (limited to 'dix/privates.c')
| -rw-r--r-- | dix/privates.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/dix/privates.c b/dix/privates.c index a12c8bfcb..0722d9f29 100644 --- a/dix/privates.c +++ b/dix/privates.c @@ -574,7 +574,6 @@ AllocateGCPrivate(register ScreenPtr pScreen, int index2, unsigned amount) /* * pixmap private machinery */ -#ifdef PIXPRIV static int pixmapPrivateCount; void @@ -620,7 +619,6 @@ AllocatePixmapPrivate(register ScreenPtr pScreen, int index2, unsigned amount) pScreen->totalPixmapSize = BitmapBytePad(pScreen->totalPixmapSize * 8); return TRUE; } -#endif /* |