Merge pull request #75 from dreamer/steam-runtime-compilation-error

adam-sawicki-a · web-flow · commit bbdcdae100d8 · 2019-09-06T14:52:30.000+02:00
Use fallback aligned_alloc for pre-C++17 glibc++
diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
@@ -3314,7 +3314,7 @@ void *aligned_alloc(size_t alignment, size_t size)
 
     return memalign(alignment, size);
 }
-#elif defined(__APPLE__) || defined(__ANDROID__)
+#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC))
 #include <cstdlib>
 void *aligned_alloc(size_t alignment, size_t size)
 {

Original file line number	Diff line number	Diff line change
`@@ -3314,7 +3314,7 @@ void *aligned_alloc(size_t alignment, size_t size)`
`3314`	`3314`
`3315`	`3315`	`return memalign(alignment, size);`
`3316`	`3316`	`}`
`3317`		`-#elif defined(__APPLE__) \|\| defined(__ANDROID__)`
	`3317`	`+#elif defined(__APPLE__) \|\| defined(__ANDROID__) \|\| (defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC))`
`3318`	`3318`	`#include <cstdlib>`
`3319`	`3319`	`void *aligned_alloc(size_t alignment, size_t size)`
`3320`	`3320`	`{`