summaryrefslogtreecommitdiffstats
path: root/clang
diff options
context:
space:
mode:
authorNAKAMURA Takumi <geek4civic@gmail.com>2011-03-15 02:32:43 +0000
committerNAKAMURA Takumi <geek4civic@gmail.com>2011-03-15 02:32:43 +0000
commit1a780ee8a9cc4058823cac477e54416f201660b0 (patch)
treed515c0687eb18d3728baeecfd64fc1574cffce78 /clang
parent63b4b456be050968c2eb6ed77ade88dd25c8e820 (diff)
downloadbcm5719-llvm-1a780ee8a9cc4058823cac477e54416f201660b0.tar.gz
bcm5719-llvm-1a780ee8a9cc4058823cac477e54416f201660b0.zip
lib/Headers/mm_malloc.h: On Windows, we can expect _mm_malloc would be provided as macro by <malloc.h>.
llvm-svn: 127654
Diffstat (limited to 'clang')
-rw-r--r--clang/lib/Headers/mm_malloc.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/clang/lib/Headers/mm_malloc.h b/clang/lib/Headers/mm_malloc.h
index e7da5434587..ec9236204bb 100644
--- a/clang/lib/Headers/mm_malloc.h
+++ b/clang/lib/Headers/mm_malloc.h
@@ -40,6 +40,7 @@ extern "C" int posix_memalign(void **memptr, size_t alignment, size_t size);
#endif
#endif
+#if !(defined(_WIN32) && defined(_mm_malloc))
static __inline__ void *__attribute__((__always_inline__, __nodebug__,
__malloc__))
_mm_malloc(size_t size, size_t align)
@@ -67,5 +68,6 @@ _mm_free(void *p)
{
free(p);
}
+#endif
#endif /* __MM_MALLOC_H */
OpenPOWER on IntegriCloud