projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
engines/glusterfs_async: cleanups
[fio.git]
/
memalign.c
diff --git
a/memalign.c
b/memalign.c
index 87667b42c35c7bea3f5d4c5d3e3a7a60c8a94539..cfd6e463ff924682d44346d130283094b7de3a07 100644
(file)
--- a/
memalign.c
+++ b/
memalign.c
@@
-1,5
+1,6
@@
#include <stdlib.h>
#include <assert.h>
#include <stdlib.h>
#include <assert.h>
+#include <inttypes.h>
#include "memalign.h"
#include "memalign.h"
@@
-8,7
+9,7
@@
struct align_footer {
};
#define PTR_ALIGN(ptr, mask) \
};
#define PTR_ALIGN(ptr, mask) \
- (char *) (((u
nsigned long
) ((ptr) + (mask)) & ~(mask)))
+ (char *) (((u
intptr_t
) ((ptr) + (mask)) & ~(mask)))
void *fio_memalign(size_t alignment, size_t size)
{
void *fio_memalign(size_t alignment, size_t size)
{
@@
-19,9
+20,9
@@
void *fio_memalign(size_t alignment, size_t size)
ptr = malloc(size + alignment + size + sizeof(*f) - 1);
if (ptr) {
ptr = malloc(size + alignment + size + sizeof(*f) - 1);
if (ptr) {
- ret = PTR_ALIGN(ptr, alignment);
+ ret = PTR_ALIGN(ptr, alignment
- 1
);
f = ret + size;
f = ret + size;
- f->offset = (u
nsigned long) ret - (unsigned long
) ptr;
+ f->offset = (u
intptr_t) ret - (uintptr_t
) ptr;
}
return ret;
}
return ret;