← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/atomics.h

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/atomics.h
31
31
#  define ATOMIC_TRAITS internal::pthread_traits
32
32
# endif
33
33
 
34
 
# if (SIZEOF_SIZE_T >= SIZEOF_LONG_LONG) || (!defined(HAVE_GCC_ATOMIC_BUILTINS) || !defined(__SUNPRO_CC))
 
34
# if (SIZEOF_SIZE_T >= SIZEOF_LONG_LONG) || (!defined(HAVE_GCC_ATOMIC_BUILTINS) || !defined(__SUNPRO_CC)) || defined(__ppc__)
35
35
#  include <pthread.h>
36
36
#  include <drizzled/atomic/pthread_traits.h>
37
37
# endif
169
169
 * so we'll use pthread locks to handler 64-bit types on that platforms
170
170
 */
171
171
/* *INDENT-OFF* */
172
 
#  if SIZEOF_SIZE_T >= SIZEOF_LONG_LONG
 
172
# if !defined(__ppc__) && (defined(_INT64_TYPE) || defined(_LP64))
173
173
__DRIZZLE_DECL_ATOMIC(long long)
174
174
__DRIZZLE_DECL_ATOMIC(unsigned long long)
175
175
#  else