hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-22 20:35:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into XACE-SELINUX

Browse source
This commit is contained in:
Eamon Walsh 2007-03-07 09:03:46 -05:00 • committed by Eamon Walsh
commit bb111291d8
39 changed files with 911 additions and 350 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/pixmapstr.h
View file

@ -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;

4
include/screenint.h
View file

@ -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);

2
include/scrnintstr.h
View file

@ -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;