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

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

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

6399N/A }

6399N/A #endif

6399N/A

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

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

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

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

6399N/A static inline int

6399N/A __builtin_constant_p(int x)

6399N/A {

6399N/A