X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FVPIT-XSHelpers.git;a=blobdiff_plain;f=xsh%2Fmem.h;h=e1b90b333688bd954e48d05f3ff32a6eeac02601;hp=9b59a71eb82a44d2ca72fefc29e54936dc315618;hb=ae9dac2afcda73d39905af2af302aada956ea92d;hpb=1536a5dd62387d25653e80e8cfe2e0e86f5230ed diff --git a/xsh/mem.h b/xsh/mem.h index 9b59a71..e1b90b3 100644 --- a/xsh/mem.h +++ b/xsh/mem.h @@ -1,7 +1,7 @@ #ifndef XSH_MEM_H #define XSH_MEM_H 1 -#include "util.h" /* VOID2(), XSH_ASSERT() */ +#include "util.h" /* XSH_ASSERT() */ #ifdef DEBUGGING # ifdef Poison @@ -72,13 +72,13 @@ static void *xsh_shared_alloc(pPMS_ size_t size) { #endif /* !XSH_HAS_POISON_NEW */ -#define XSH_SHARED_ALLOC(D, N, T) ((D) = VOID2(T *, xsh_shared_alloc((N) * sizeof(T)))) +#define XSH_SHARED_ALLOC(D, N, T) ((D) = xsh_shared_alloc((N) * sizeof(T))) /* ... xsh_shared_calloc() ................................................. */ #define xsh_shared_calloc(C, S) PerlMemShared_calloc((C), (S)) -#define XSH_SHARED_CALLOC(D, N, T) ((D) = VOID2(T *, xsh_shared_calloc((N), sizeof(T)))) +#define XSH_SHARED_CALLOC(D, N, T) ((D) = xsh_shared_calloc((N), sizeof(T))) /* ... xsh_shared_free() ................................................... */ @@ -136,7 +136,7 @@ static void *xsh_shared_realloc(pPMS_ void *p, size_t old_size, size_t new_size) #endif /* !XSH_HAS_POISON_NEW || !XSH_HAS_POISON_FREE */ -#define XSH_SHARED_REALLOC(D, OL, NL, T) ((D) = VOID2(T *, xsh_shared_realloc((D), (OL) * sizeof(T), (NL) * sizeof(T)))) +#define XSH_SHARED_REALLOC(D, OL, NL, T) ((D) = xsh_shared_realloc((D), (OL) * sizeof(T), (NL) * sizeof(T))) /* ... xsh_shared_recalloc() ............................................... */ @@ -158,7 +158,7 @@ static void *xsh_shared_recalloc(pPMS_ void *p, size_t old_size, size_t new_size return q; } -#define XSH_SHARED_RECALLOC(D, OL, NL, T) ((D) = VOID2(T *, xsh_shared_recalloc((D), (OL) * sizeof(T), (NL) * sizeof(T)))) +#define XSH_SHARED_RECALLOC(D, OL, NL, T) ((D) = xsh_shared_recalloc((D), (OL) * sizeof(T), (NL) * sizeof(T))) /* --- Interpreter-local memory -------------------------------------------- */