Merge from existing archive branch

[pcre3.git] / sljit / sljitExecAllocator.c

diff --git a/sljit/sljitExecAllocator.c b/sljit/sljitExecAllocator.c
index f24ed337973e7f07510f6bf81664ae8c79c8c463..54f05f5dd70f98bc99a69520eda48f062c539515 100644 (file)
--- a/sljit/sljitExecAllocator.c
+++ b/sljit/sljitExecAllocator.c
@@ -137,10 +137,10 @@ struct free_block {
 };
 
 #define AS_BLOCK_HEADER(base, offset) \
-       ((struct block_header*)(((sljit_ub*)base) + offset))
+       ((struct block_header*)(((sljit_u8*)base) + offset))
 #define AS_FREE_BLOCK(base, offset) \
-       ((struct free_block*)(((sljit_ub*)base) + offset))
-#define MEM_START(base)                ((void*)(((sljit_ub*)base) + sizeof(struct block_header)))
+       ((struct free_block*)(((sljit_u8*)base) + offset))
+#define MEM_START(base)                ((void*)(((sljit_u8*)base) + sizeof(struct block_header)))
 #define ALIGN_SIZE(size)       (((size) + sizeof(struct block_header) + 7) & ~7)
 
 static struct free_block* free_blocks;
@@ -153,7 +153,7 @@ static SLJIT_INLINE void sljit_insert_free_block(struct free_block *free_block,
        free_block->size = size;
 
        free_block->next = free_blocks;
-       free_block->prev = 0;
+       free_block->prev = NULL;
        if (free_blocks)
                free_blocks->prev = free_block;
        free_blocks = free_block;