From b9f8fe4a4d594557cae69607cde4377a7744920b Mon Sep 17 00:00:00 2001
From: Luke Benstead <kazade@gmail.com>
Date: Thu, 18 Oct 2018 09:54:34 +0100
Subject: [PATCH] Clean up the memalign switching a bit

---
 containers/aligned_vector.c | 12 +++++-------
 containers/stack.c          | 13 ++++++-------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/containers/aligned_vector.c b/containers/aligned_vector.c
index 4f44c92..67f2804 100644
--- a/containers/aligned_vector.c
+++ b/containers/aligned_vector.c
@@ -2,15 +2,13 @@
 #include <string.h>
 #include <math.h>
 
-#ifndef __APPLE__
-#if defined(__WIN32__)
+#if defined(__APPLE__) || defined(__WIN32__)
 /* Linux + Kos define this, OSX does not, so just use malloc there */
-#define memalign(x, size) malloc((size))
+static inline void* memalign(size_t alignment, size_t size) {
+    return malloc(size);
+}
 #else
-#include <malloc.h>
-#endif 
-/* Linux + Kos define this, OSX does not, so just use malloc there */
-#define memalign(x, size) malloc((size))
+    #include <malloc.h>
 #endif
 
 #include "aligned_vector.h"
diff --git a/containers/stack.c b/containers/stack.c
index 8370e24..80aa0bc 100644
--- a/containers/stack.c
+++ b/containers/stack.c
@@ -1,14 +1,13 @@
 #include <string.h>
+#include <stdlib.h>
 
-#ifndef __APPLE__
-#if defined(__WIN32__)
+#if defined(__APPLE__) || defined(__WIN32__)
 /* Linux + Kos define this, OSX does not, so just use malloc there */
-#define memalign(x, size) malloc((size))
+static inline void* memalign(size_t alignment, size_t size) {
+    return malloc(size);
+}
 #else
-#include <malloc.h>
-#endif 
-/* Linux + Kos define this, OSX does not, so just use malloc there */
-#define memalign(x, size) malloc((size))
+    #include <malloc.h>
 #endif
 
 #include "stack.h"