mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-08 23:12:27 +00:00
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts: hw/xfree86/Makefile.am hw/xfree86/dri/dri.c
This commit is contained in:
commit
2c6d471088
404 changed files with 20687 additions and 8022 deletions
|
|
@ -628,7 +628,7 @@ typedef struct _xf86_file_ {
|
|||
char* fname;
|
||||
} XF86FILE_priv;
|
||||
|
||||
XF86FILE_priv stdhnd[3] = {
|
||||
static XF86FILE_priv stdhnd[3] = {
|
||||
{ 0, XF86FILE_magic, NULL, "$stdinp$" },
|
||||
{ 0, XF86FILE_magic, NULL, "$stdout$" },
|
||||
{ 0, XF86FILE_magic, NULL, "$stderr$" }
|
||||
|
|
|
|||
Loading…
Reference in a new issue