diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-04 10:41:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-04 10:41:31 +0200 |
| commit | b3daaeb1467f3d3d52bef2f76413f3a063fc4f33 (patch) | |
| tree | 4415e903a15dff8b36bba9fcce197d26a7790186 /xorg-server/hw/xfree86/os-support/shared/sigio.c | |
| parent | e44d0067ca65d58f258e7f2ae1a240c9bfce5766 (diff) | |
| parent | fc8f37239f3af088819c18f5632b2608954af73a (diff) | |
| download | vcxsrv-b3daaeb1467f3d3d52bef2f76413f3a063fc4f33.tar.gz vcxsrv-b3daaeb1467f3d3d52bef2f76413f3a063fc4f33.tar.bz2 vcxsrv-b3daaeb1467f3d3d52bef2f76413f3a063fc4f33.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/include/misc.h
xorg-server/os/utils.c
Diffstat (limited to 'xorg-server/hw/xfree86/os-support/shared/sigio.c')
| -rw-r--r-- | xorg-server/hw/xfree86/os-support/shared/sigio.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/hw/xfree86/os-support/shared/sigio.c b/xorg-server/hw/xfree86/os-support/shared/sigio.c index 12ae8a480..231d6c04f 100644 --- a/xorg-server/hw/xfree86/os-support/shared/sigio.c +++ b/xorg-server/hw/xfree86/os-support/shared/sigio.c @@ -99,6 +99,8 @@ xf86SIGIO(int sig) int save_errno = errno; /* do not clobber the global errno */ int r; + inSignalContext = TRUE; + ready = xf86SigIOMask; to.tv_sec = 0; to.tv_usec = 0; @@ -114,6 +116,8 @@ xf86SIGIO(int sig) } /* restore global errno */ errno = save_errno; + + inSignalContext = FALSE; } static int |