diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-13 12:16:00 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-13 12:16:00 +0200 |
| commit | dcf9ae77854778629cabd0d6943dda3678eb91fa (patch) | |
| tree | 087d3bb4beb55bcc0c5857b41d2b5b10edd0e2f3 /xorg-server/os | |
| parent | 2c8d7aa6bda138693fa1827852ba6b75d1721ff8 (diff) | |
| parent | f0a7d1d88be0c31bd471f4428c4493a93f2d9321 (diff) | |
| download | vcxsrv-dcf9ae77854778629cabd0d6943dda3678eb91fa.tar.gz vcxsrv-dcf9ae77854778629cabd0d6943dda3678eb91fa.tar.bz2 vcxsrv-dcf9ae77854778629cabd0d6943dda3678eb91fa.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/glxext.c
xorg-server/hw/xwin/InitOutput.c
Diffstat (limited to 'xorg-server/os')
| -rw-r--r-- | xorg-server/os/utils.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c index b1bd5ce94..909c1f73e 100644 --- a/xorg-server/os/utils.c +++ b/xorg-server/os/utils.c @@ -1266,8 +1266,10 @@ OsBlockSIGIO(void) ret = sigismember(&old, SIGIO); return ret; } else - return 1; #endif + return 1; +#else + return 1; #endif } |