diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-08-17 13:43:29 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-11-28 14:43:35 +0000 |
| commit | 98d5acc1213b2ec71c2a7bd3a3b77a1b5536e963 (patch) | |
| tree | e08efb6c2f8a33ae768c268e330381be60b5f5a7 /os | |
| parent | 8e2bac0a69173b51e17a39d70e1d154b47fd0139 (diff) | |
os/utils.c: Fix compilation of OsBlockSIGIO when SIGIO isn't defined
Fix compilation of OsBlockSIGIO with -Werror=return-type when SIGIO isn't
defined.
/jhbuild/checkout/xorg/xserver/os/utils.c: In function 'OsBlockSIGIO':
/jhbuild/checkout/xorg/xserver/os/utils.c:1248:1: error: control reaches end of non-void function [-Wreturn-type]
v2: Shuffle around to avoid writing unreachable code
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Tested-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'os')
| -rw-r--r-- | os/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/os/utils.c b/os/utils.c index 58df70902..411daa047 100644 --- a/os/utils.c +++ b/os/utils.c @@ -1231,10 +1231,10 @@ OsBlockSIGIO(void) sigprocmask(SIG_BLOCK, &set, &PreviousSigIOMask); ret = sigismember(&PreviousSigIOMask, SIGIO); return ret; - } else - return 1; + } #endif #endif + return 1; } void |