diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-03-06 15:32:13 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2007-03-06 17:05:03 -0500 |
| commit | a7cd53deb99957dec27a55ffd75e548b322ae0ce (patch) | |
| tree | e6bcdc483b086b3336725f3d654932ddcd579a29 /include | |
| parent | 024bbc7cbb924daaf3e305ddfc8e74509acd1e15 (diff) | |
remove PIXPRIV checks as this flag is always set.
Diffstat (limited to 'include')
| -rw-r--r-- | include/pixmapstr.h | 2 | ||||
| -rw-r--r-- | include/screenint.h | 4 | ||||
| -rw-r--r-- | include/scrnintstr.h | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/include/pixmapstr.h b/include/pixmapstr.h index 628465b97..93bd45db8 100644 --- a/include/pixmapstr.h +++ b/include/pixmapstr.h @@ -86,9 +86,7 @@ typedef struct _Pixmap { int refcnt; int devKind; DevUnion devPrivate; -#ifdef PIXPRIV DevUnion *devPrivates; /* real devPrivates like gcs & windows */ -#endif #ifdef COMPOSITE short screen_x; short screen_y; diff --git a/include/screenint.h b/include/screenint.h index e60c2480c..1f1434a84 100644 --- a/include/screenint.h +++ b/include/screenint.h @@ -86,8 +86,6 @@ extern int AddScreen( int /*argc*/, char** /*argv*/); -#ifdef PIXPRIV - extern void ResetPixmapPrivates(void); extern int AllocatePixmapPrivateIndex(void); @@ -97,8 +95,6 @@ extern Bool AllocatePixmapPrivate( int /* index */, unsigned /* amount */); -#endif /* PIXPRIV */ - extern void ResetColormapPrivates(void); diff --git a/include/scrnintstr.h b/include/scrnintstr.h index 36135153f..110f4dce9 100644 --- a/include/scrnintstr.h +++ b/include/scrnintstr.h @@ -558,11 +558,9 @@ typedef struct _Screen { PixmapPtr pScratchPixmap; /* scratch pixmap "pool" */ -#ifdef PIXPRIV int PixmapPrivateLen; unsigned int *PixmapPrivateSizes; unsigned int totalPixmapSize; -#endif MarkWindowProcPtr MarkWindow; MarkOverlappedWindowsProcPtr MarkOverlappedWindows; |