← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/atomics.h

  • Committer: Brian Aker
  • Date: 2009-07-16 19:30:03 UTC
  • mfrom: (1093.1.17 captain)
  • Revision ID: brian@gaz-20090716193003-gwt4i1le2g02ay0j
Merge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/atomics.h
35
35
# if defined(__SUNPRO_CC)
36
36
#  include <drizzled/atomic/sun_studio.h>
37
37
# endif
38
 
# if defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(__SUNPRO_CC)
 
38
# if !defined(__ICC) && (defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(__SUNPRO_CC))
39
39
#  include <drizzled/atomic/gcc_traits.h>
40
40
#  define ATOMIC_TRAITS internal::gcc_traits
41
41
# else  /* use pthread impl */