[PULL] Xserver build fixes for Windows MinGW target.

Keith Packard keithp at keithp.com
Tue Nov 27 15:08:31 PST 2012


Jon TURNEY <jon.turney at dronecode.org.uk> writes:

>       os/utils.c: Fix compilation of OsBlockSIGIO when SIGIO isn't defined

This should probably look like this instead, to avoid compilers
complaining about unreachable code:

diff --git a/os/utils.c b/os/utils.c
index 3c520ad..0d77b84 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1227,10 +1227,10 @@ OsBlockSIGIO(void)
         sigprocmask(SIG_BLOCK, &set, &PreviousSigIOMask);
         ret = sigismember(&PreviousSigIOMask, SIGIO);
         return ret;
-    } else
-        return 1;
+    }
 #endif
 #endif
+    return 1;
 }
 
 void

> Yaakov Selkowitz (2):
>       hw/xwin: use raise instead of signal

This should be fine (it's in POSIX.1-2001 according to the Linux
raise(3) man page). If we find a system this breaks on, it will be easy
to fix (testing for raise in the c library and using it only if present).

The other patches were also Reviewed-by: Keith Packard <keithp at keithp.com>

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20121127/7838aba1/attachment.pgp>


More information about the xorg-devel mailing list