diff --git a/src/utils.c b/src/utils.c index 6dc17f1d..0100c256 100644 --- a/src/utils.c +++ b/src/utils.c @@ -263,24 +263,6 @@ ss_aligned_malloc(size_t size) } } -void -ss_aligned_free(void *ptr) -{ -#ifdef __MINGW32__ - _aligned_free(ptr); -#else - free(ptr); -#endif - ptr = NULL; -} - -void -ss_free(void *ptr) -{ - free(ptr); - ptr = NULL; -} - void * ss_realloc(void *ptr, size_t new_size) { diff --git a/src/utils.h b/src/utils.h index e9ae0530..b95729dd 100644 --- a/src/utils.h +++ b/src/utils.h @@ -229,8 +229,22 @@ int set_nofile(int nofile); void *ss_malloc(size_t size); void *ss_aligned_malloc(size_t size); void *ss_realloc(void *ptr, size_t new_size); -void ss_aligned_free(void *ptr); -void ss_free(void *ptr); + +#define ss_free(ptr) \ +{ \ + free(ptr); \ + ptr = NULL; \ +} + +#ifdef __MINGW32__ +#define ss_aligned_free(ptr) \ +{ \ + _aligned_free(ptr); \ + ptr = NULL; \ +} +#else +#define ss_aligned_free(ptr) ss_free(ptr) +#endif int ss_is_ipv6addr(const char *addr);