diff options
| author | Ben Cheng <bccheng@google.com> | 2014-04-22 13:33:12 -0700 |
|---|---|---|
| committer | Ben Cheng <bccheng@google.com> | 2014-04-22 13:33:12 -0700 |
| commit | e3cc64dec20832769406aa38cde83c7dd4194bf4 (patch) | |
| tree | ef8e39be37cfe0cb69d850043b7924389ff17164 /gcc-4.9/libcilkrts/include | |
| parent | f33c7b3122b1d7950efa88067c9a156229ba647b (diff) | |
| download | toolchain_gcc-e3cc64dec20832769406aa38cde83c7dd4194bf4.tar.gz toolchain_gcc-e3cc64dec20832769406aa38cde83c7dd4194bf4.tar.bz2 toolchain_gcc-e3cc64dec20832769406aa38cde83c7dd4194bf4.zip | |
[4.9] GCC 4.9.0 official release refresh
Change-Id: Ic99a7da8b44b789a48aeec93b33e93944d6e6767
Diffstat (limited to 'gcc-4.9/libcilkrts/include')
| -rw-r--r-- | gcc-4.9/libcilkrts/include/cilk/metaprogramming.h | 2 | ||||
| -rw-r--r-- | gcc-4.9/libcilkrts/include/cilk/reducer_min_max.h | 2 |
2 files changed, 2 insertions, 2 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; diff --git a/gcc-4.9/libcilkrts/include/cilk/reducer_min_max.h b/gcc-4.9/libcilkrts/include/cilk/reducer_min_max.h index 55f068c34..7fe09e8d6 100644 --- a/gcc-4.9/libcilkrts/include/cilk/reducer_min_max.h +++ b/gcc-4.9/libcilkrts/include/cilk/reducer_min_max.h @@ -3025,7 +3025,7 @@ struct legacy_reducer_downcast< reducer< op_min_index<Index, Type, Compare, Alig #include <limits.h> /* Wchar_t min/max constants */ -#if defined(_MSC_VER) || defined(ANDROID) +#if defined(_MSC_VER) || defined(__ANDROID__) # include <wchar.h> #else # include <stdint.h> |