mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-18 00:42:40 +00:00
Merge branch 'master' into XACE-SELINUX
Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c
This commit is contained in:
commit
a52c9b2a59
270 changed files with 1593 additions and 1827 deletions
|
|
@ -29,7 +29,7 @@ typedef struct {
|
|||
#define xnestSharePixmap(pPixmap) ((pPixmap)->refcnt++)
|
||||
|
||||
PixmapPtr xnestCreatePixmap(ScreenPtr pScreen, int width, int height,
|
||||
int depth);
|
||||
int depth, unsigned usage_hint);
|
||||
Bool xnestDestroyPixmap(PixmapPtr pPixmap);
|
||||
RegionPtr xnestPixmapToRegion(PixmapPtr pPixmap);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue