From 8b38fe5ab686c92b276f7ea5652853cb6a38492a Mon Sep 17 00:00:00 2001 From: Yorgos Thessalonikefs Date: Wed, 2 Apr 2025 11:53:50 +0200 Subject: [PATCH] - For #1262, ifdef is no longer needed. --- compat/malloc.c | 4 ---- doc/Changelog | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/compat/malloc.c b/compat/malloc.c index af9dcf134..74beae01c 100644 --- a/compat/malloc.c +++ b/compat/malloc.c @@ -5,12 +5,8 @@ #undef malloc #include -#ifndef USE_WINSOCK -void *malloc (size_t n); -#else /* provide a prototype */ void *malloc (size_t n); -#endif /* Allocate an N-byte block of memory from the heap. If N is zero, allocate a 1-byte block. */ diff --git a/doc/Changelog b/doc/Changelog index 705dd3f7d..321a3b9b7 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,6 +1,7 @@ 2 April 2025: Yorgos - Merge #1262 from markyang92, fix build with 'gcc-15 -Wbuiltin-declaration-mismatch' error in compat/malloc.c. + - For #1262, ifdef is no longer needed. 1 April 2025: Wouter - Fix escape more characters when printing an RR type with an unquoted -- 2.47.3