diff options
| author | kyukhin <kyukhin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-04-17 11:52:44 +0000 |
|---|---|---|
| committer | kyukhin <kyukhin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-04-17 11:52:44 +0000 |
| commit | fde7670e540a79a886d5a9d0495a4a1eeb0e6590 (patch) | |
| tree | f961ac80350f6d04255b818bc67315815ce4dd22 /libcilkrts/include | |
| parent | ac001c5f0ed9dd8dceb97272c4626b17094e23fa (diff) | |
| download | ppe42-gcc-fde7670e540a79a886d5a9d0495a4a1eeb0e6590.tar.gz ppe42-gcc-fde7670e540a79a886d5a9d0495a4a1eeb0e6590.zip | |
libcilkrts/
PR other/60644
* runtime/os-unix.c: Replaced all occurrances of ANDROID with
__ANDROID__.
* runtime/bug.h: Likewise.
* include/cilk/metaprogramming.h: Likewise.
* include/cilk/reducer_min_max.h: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@209474 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcilkrts/include')
| -rw-r--r-- | libcilkrts/include/cilk/metaprogramming.h | 2 | ||||
| -rw-r--r-- | libcilkrts/include/cilk/reducer_min_max.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libcilkrts/include/cilk/metaprogramming.h b/libcilkrts/include/cilk/metaprogramming.h index 5f6f29df87b..29b0839e788 100644 --- a/libcilkrts/include/cilk/metaprogramming.h +++ b/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/libcilkrts/include/cilk/reducer_min_max.h b/libcilkrts/include/cilk/reducer_min_max.h index 55f068c34a3..7fe09e8d605 100644 --- a/libcilkrts/include/cilk/reducer_min_max.h +++ b/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> |
