2d0611ffc9f91c5fc2ddccb93f9a3d17791ae650takashi--- a/unix/xserver/include/misc.h Thu Jul 10 11:37:34 2014
2d0611ffc9f91c5fc2ddccb93f9a3d17791ae650takashi+++ b/unix/xserver/include/misc.h Thu Jul 10 11:38:50 2014
dc0d8d65d35787d30a275895ccad8d8e1b58a5ednd@@ -297,7 +297,9 @@
6ae232055d4d8a97267517c5e50074c2c819941and-#if !(defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)))
0a94a19595172eac7686b569ed110be7fab8cb9dyoshiki+#if !(defined(__GNUC__) \
6ae232055d4d8a97267517c5e50074c2c819941and+ || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) \
5652dbe450e4fcfdf36d4cfb42d7f2345ded29a4maczniak+ || (defined(__SUNPRO_CC) && (__SUNPRO_CC >= 0x5130)))
5652dbe450e4fcfdf36d4cfb42d7f2345ded29a4maczniak static inline int
5652dbe450e4fcfdf36d4cfb42d7f2345ded29a4maczniak __builtin_constant_p(int x)