Fixed compiler issues

storage/innobase/include/univ.i

@@ -9,7 +9,7 @@ Created 1/20/1994 Heikki Tuuri
 #ifndef univ_i
 #define univ_i
 
-#if ( defined(sun) || defined(__sun) )
+#ifdef __SUNPRO_C
 # include <sun_prefetch.h>
 #endif
 
@@ -281,7 +281,7 @@ it is read. */
 /* Minimize cache-miss latency by moving data at addr into a cache before
 it is read or written. */
 # define UNIV_PREFETCH_RW(addr) __builtin_prefetch(addr, 1, 3)
-#elif ( defined(sun) || defined(__sun) )
+#elif defined(__SUNPRO_C)
 # define UNIV_EXPECT(expr,value) (expr)
 # define UNIV_LIKELY_NULL(expr) (expr)
 # define UNIV_PREFETCH_R(addr) sparc_prefetch_read_many(addr)