aboutsummaryrefslogtreecommitdiff
path: root/icd/common/icd-instance.c
diff options
context:
space:
mode:
authorIan Elliott <ian@LunarG.com>2015-03-06 14:34:47 -0700
committerIan Elliott <ian@LunarG.com>2015-03-06 14:34:47 -0700
commitb9bd8bea8b01afe4fed58d668cdc2eb5c119d421 (patch)
treec6c83a2f91af23c414f3b67f70638f3870107a95 /icd/common/icd-instance.c
parentcc98270fde030bbaa03cc020f8f0749eccd62afb (diff)
downloadusermoji-b9bd8bea8b01afe4fed58d668cdc2eb5c119d421.tar.xz
Win/C11: Use _align_malloc() on Windows, align_alloc() elsewhere.
Diffstat (limited to 'icd/common/icd-instance.c')
-rw-r--r--icd/common/icd-instance.c4
1 files changed, 4 insertions, 0 deletions
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;