mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-26 21:12:25 +00:00
Merge branch 'master' into XACE-SELINUX
Conflicts: include/miscstruct.h mi/mibstore.c mi/midispcur.c os/Makefile.am
This commit is contained in:
commit
8554707326
187 changed files with 2661 additions and 179913 deletions
|
|
@ -452,8 +452,6 @@ miDCMakeGC(
|
|||
pGC = CreateGC((DrawablePtr)pWin,
|
||||
GCSubwindowMode|GCGraphicsExposures, gcvals, &status,
|
||||
(XID)0, serverClient);
|
||||
if (pGC && pWin->drawable.pScreen->DrawGuarantee)
|
||||
(*pWin->drawable.pScreen->DrawGuarantee) (pWin, pGC, GuaranteeVisBack);
|
||||
*ppGC = pGC;
|
||||
return pGC;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue