1462N/A--- a/unix/xserver/include/misc.h Thu Jul 10 11:37:34 2014

1462N/A+++ b/unix/xserver/include/misc.h Thu Jul 10 11:38:50 2014

1462N/A@@ -297,7 +297,9 @@

1462N/A }

1462N/A #endif

1462N/A

1462N/A-#if !(defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)))

1462N/A+#if !(defined(__GNUC__) \

1462N/A+ || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) \

1462N/A+ || (defined(__SUNPRO_CC) && (__SUNPRO_CC >= 0x5130)))

1462N/A static inline int

1462N/A __builtin_constant_p(int x)

1462N/A {