Refactor #includes and headers

[fio.git] / lib / memalign.c

diff --git a/lib/memalign.c b/lib/memalign.c
index 1d1ba9ba2013ea2c3fdba579931ff1743989cdd7..e774c19c3ebe9980008b38afacc4c29c475ca666 100644 (file)
--- a/lib/memalign.c
+++ b/lib/memalign.c
@@ -1,9 +1,10 @@
-#include <stdlib.h>
 #include <assert.h>
-#include <inttypes.h>
+#include <stdlib.h>
 
 #include "memalign.h"
-#include "../fio.h"
+
+#define PTR_ALIGN(ptr, mask)   \
+       (char *)((uintptr_t)((ptr) + (mask)) & ~(mask))
 
 struct align_footer {
        unsigned int offset;
@@ -16,7 +17,7 @@ void *fio_memalign(size_t alignment, size_t size)
 
        assert(!(alignment & (alignment - 1)));
 
-       ptr = malloc(size + alignment + size + sizeof(*f) - 1);
+       ptr = malloc(size + alignment + sizeof(*f) - 1);
        if (ptr) {
                ret = PTR_ALIGN(ptr, alignment - 1);
                f = ret + size;