aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.9/libcilkrts/include/cilk/metaprogramming.h
diff options
context:
space:
mode:
Diffstat (limited to 'gcc-4.9/libcilkrts/include/cilk/metaprogramming.h')
-rw-r--r--gcc-4.9/libcilkrts/include/cilk/metaprogramming.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc-4.9/libcilkrts/include/cilk/metaprogramming.h b/gcc-4.9/libcilkrts/include/cilk/metaprogramming.h
index 5f6f29df8..29b0839e7 100644
--- a/gcc-4.9/libcilkrts/include/cilk/metaprogramming.h
+++ b/gcc-4.9/libcilkrts/include/cilk/metaprogramming.h
@@ -468,7 +468,7 @@ inline void* allocate_aligned(std::size_t size, std::size_t alignment)
#ifdef _WIN32
return _aligned_malloc(size, alignment);
#else
-#if defined(ANDROID) || defined(__ANDROID__)
+#if defined(__ANDROID__)
return memalign(std::max(alignment, sizeof(void*)), size);
#else
void* ptr;