~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/include/univ.i

Merged solaris gcc build fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
32
32
#ifndef univ_i
33
33
#define univ_i
34
34
 
35
 
#if ( defined(sun) || defined(__sun) )
 
35
#if (defined(__SUNPRO_C) || defined(__SUNPRO_CC))
36
36
# include <sun_prefetch.h>
37
37
#endif
38
38
 
407
407
/* Minimize cache-miss latency by moving data at addr into a cache before
408
408
it is read or written. */
409
409
# define UNIV_PREFETCH_RW(addr) __builtin_prefetch(addr, 1, 3)
410
 
#elif ( defined(sun) || defined(__sun) )
 
410
#elif (defined(__SUNPRO_C) || defined(__SUNPRO_CC))
411
411
# define UNIV_EXPECT(expr,value) (expr)
412
412
# define UNIV_LIKELY_NULL(expr) (expr)
413
413
# define UNIV_PREFETCH_R(addr) sun_prefetch_read_many((void *)(addr))