diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-04-04 16:54:00 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-04-04 16:54:00 -0700 |
| commit | 4fb2daf42c8171579cdc18605c5ceeb1963f8b31 (patch) | |
| tree | da534f83de94161df440986ad5e36df245291552 /src/gallium/auxiliary | |
| parent | ad3575e2dd81252e9ea341d1a7355e0bfd1cccee (diff) | |
| parent | f66733e0773b4ec794438dd2422aeb28a791adda (diff) | |
Merge branch '7.8'
Diffstat (limited to 'src/gallium/auxiliary')
| -rw-r--r-- | src/gallium/auxiliary/util/u_atomic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/util/u_atomic.h b/src/gallium/auxiliary/util/u_atomic.h index 3c42477ad4..a156823390 100644 --- a/src/gallium/auxiliary/util/u_atomic.h +++ b/src/gallium/auxiliary/util/u_atomic.h @@ -29,7 +29,7 @@ #define PIPE_ATOMIC_ASM_MSVC_X86 #elif (defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86)) #define PIPE_ATOMIC_ASM_GCC_X86 -#elif defined(PIPE_CC_GCC) +#elif defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 401) #define PIPE_ATOMIC_GCC_INTRINSIC #else #error "Unsupported platform" |