Merge branch 'tb/char-may-be-unsigned' into maint

diff --git a/alloc.c b/alloc.c
index c2fc5d68886bf3f74a1f013a3a36c7b5dcad2258..e7aa81b7aa48c14f2a98894eb6e8c2e28998945e 100644 (file)
--- a/alloc.c
+++ b/alloc.c
@@ -36,7 +36,7 @@ struct alloc_state {
        int slab_nr, slab_alloc;
 };
 
-void *allocate_alloc_state(void)
+struct alloc_state *allocate_alloc_state(void)
 {
        return xcalloc(1, sizeof(struct alloc_state));
 }