mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-27 21:22:26 +00:00
Merge branch 'master' into XACE-SELINUX
Conflicts: hw/xnest/Pixmap.c include/dix.h
This commit is contained in:
commit
2d17f47cc7
46 changed files with 92 additions and 977 deletions
|
|
@ -166,6 +166,8 @@ RRModesForScreen (ScreenPtr pScreen, int *num_ret)
|
|||
int num_screen_modes = 0;
|
||||
|
||||
screen_modes = xalloc ((num_modes ? num_modes : 1) * sizeof (RRModePtr));
|
||||
if (!screen_modes)
|
||||
return NULL;
|
||||
|
||||
/*
|
||||
* Add modes from all outputs
|
||||
|
|
|
|||
Loading…
Reference in a new issue