- For #1262, ifdef is no longer needed.

diff --git a/compat/malloc.c b/compat/malloc.c
index af9dcf1341470e19559c5c44f2c8be6f1b4f7692..74beae01c98cb239b187ffb170b57608c8c8e41e 100644 (file)
--- a/compat/malloc.c
+++ b/compat/malloc.c
@@ -5,12 +5,8 @@
 #undef malloc
 #include <sys/types.h>
 
-#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 705dd3f7d090da1a798b59e4e362b6976f9f6c8c..321a3b9b7dcccfeeaf656db921b16675b06c8af1 100644 (file)
--- 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