From b9bd8bea8b01afe4fed58d668cdc2eb5c119d421 Mon Sep 17 00:00:00 2001 From: Ian Elliott Date: Fri, 6 Mar 2015 14:34:47 -0700 Subject: Win/C11: Use _align_malloc() on Windows, align_alloc() elsewhere. --- icd/common/icd-instance.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'icd/common/icd-instance.c') diff --git a/icd/common/icd-instance.c b/icd/common/icd-instance.c index 5da4d41d..2311b6c0 100644 --- a/icd/common/icd-instance.c +++ b/icd/common/icd-instance.c @@ -45,7 +45,11 @@ static void * XGLAPI default_alloc(void *user_data, size_t size, size = (size + alignment - 1) & ~(alignment - 1); +#if defined(_WIN32) + return _aligned_malloc(alignment, size); +#else return aligned_alloc(alignment, size); +#endif } else { return NULL; -- cgit v1.2.3