diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-11 11:55:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-11 11:55:48 +0200 |
| commit | 6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab (patch) | |
| tree | 21e1af7ee94600e349ae21353dc11963a06e988d /xorg-server/os/utils.c | |
| parent | 75f57cf199b6c042b0f7515e3a1ab80f7ccecfab (diff) | |
| parent | d137057fd13e83ec15ab416c7fe774741da06047 (diff) | |
| download | vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.tar.gz vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.tar.bz2 vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/shm.c
xorg-server/Xext/sync.c
xorg-server/Xext/xf86bigfont.c
xorg-server/Xi/opendev.c
xorg-server/dix/dispatch.c
xorg-server/include/globals.h
xorg-server/mi/miinitext.c
Diffstat (limited to 'xorg-server/os/utils.c')
| -rw-r--r-- | xorg-server/os/utils.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c index d61a9d67d..b1bd5ce94 100644 --- a/xorg-server/os/utils.c +++ b/xorg-server/os/utils.c @@ -138,7 +138,6 @@ Bool noDPMSExtension = FALSE; #endif #ifdef GLXEXT Bool noGlxExtension = FALSE; -Bool noGlxVisualInit = FALSE; #endif #ifdef SCREENSAVER Bool noScreenSaverExtension = FALSE; @@ -785,8 +784,8 @@ ProcessCommandLine(int argc, char *argv[]) else if (strcmp(argv[i], "-nolisten") == 0) { if (++i < argc) { if (_XSERVTransNoListen(argv[i])) - FatalError("Failed to disable listen for %s transport", - argv[i]); + ErrorF("Failed to disable listen for %s transport", + argv[i]); } else UseMsg(); @@ -1302,6 +1301,19 @@ OsReleaseSignals(void) #endif } +void +OsResetSignals(void) +{ +#ifdef SIG_BLOCK + while (BlockedSignalCount > 0) + OsReleaseSignals(); +#ifdef SIGIO + while (sigio_blocked > 0) + OsReleaseSIGIO(); +#endif +#endif +} + /* * Pending signals may interfere with core dumping. Provide a * mechanism to block signals when aborting. |