From 4bc163e4d9a8464ef64341b2f9c68ac5841c5f6f Mon Sep 17 00:00:00 2001
From: Arne Goedeke <el@laramies.com>
Date: Thu, 13 Nov 2014 15:39:46 +0100
Subject: [PATCH] rename aligned_alloc to xalloc_aligned
C11 defines aligned_alloc. This can lead to all kinds of confusion, so
lets rename our internal function.
---
src/block_allocator.c | 2 +-
src/pike_memory.c | 2 +-
src/pike_memory.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/block_allocator.c b/src/block_allocator.c
index 25a95a4e13..486a72c241 100644
--- a/src/block_allocator.c
+++ b/src/block_allocator.c
@@ -74,7 +74,7 @@ static struct ba_page * ba_alloc_page(struct block_allocator * a, int i) {
size_t n = l.offset + l.block_size + l.doffset;
struct ba_page * p;
if (l.alignment) {
- p = aligned_alloc(n, l.alignment);
+ p = xalloc_aligned(n, l.alignment);
} else {
#ifdef DEBUG_MALLOC
/* In debug malloc mode, calling xalloc from the block alloc may result
diff --git a/src/pike_memory.c b/src/pike_memory.c
index f6ef05922e..0b1e3cf920 100644
--- a/src/pike_memory.c
+++ b/src/pike_memory.c
@@ -415,7 +415,7 @@ PMOD_EXPORT void *debug_xcalloc(size_t n, size_t s)
return 0;
}
-PMOD_EXPORT void *aligned_alloc(size_t size, size_t alignment) {
+PMOD_EXPORT void *xalloc_aligned(size_t size, size_t alignment) {
void * ret;
if (!size) return 0;
diff --git a/src/pike_memory.h b/src/pike_memory.h
index 80570f0f8f..961c3ac72e 100644
--- a/src/pike_memory.h
+++ b/src/pike_memory.h
@@ -233,7 +233,7 @@ PMOD_EXPORT void *debug_xmalloc(size_t s) MALLOC_FUNCTION;
PMOD_EXPORT void debug_xfree(void *mem);
PMOD_EXPORT void *debug_xrealloc(void *m, size_t s) MALLOC_FUNCTION;
PMOD_EXPORT void *debug_xcalloc(size_t n, size_t s) MALLOC_FUNCTION;
-PMOD_EXPORT void *aligned_alloc(size_t size, size_t alignment) MALLOC_FUNCTION;
+PMOD_EXPORT void *xalloc_aligned(size_t size, size_t alignment) MALLOC_FUNCTION;
#define PIKE_ALIGNTO(x, a) (((x) + (a)-1) & ~((a)-1))
--
GitLab