Simplify check for NEED_MALLOC_H, and make more explicit that NEED_MALLOC_H shall be defined if <malloc.h> header file must be included even when including <stdlib.h>.

acinclude.m4

@@ -215,7 +215,7 @@ AC_DEFUN([CURL_CHECK_HEADER_MALLOC], [
     case "$curl_cv_need_header_malloc_h" in
       yes)
         AC_DEFINE_UNQUOTED(NEED_MALLOC_H, 1,
-          [Define to 1 if you need the malloc.h header file.])
+          [Define to 1 if you need the malloc.h header file even with stdlib.h])
         ;;
     esac
   fi

ares/acinclude.m4

@@ -193,7 +193,7 @@ AC_DEFUN([CURL_CHECK_HEADER_MALLOC], [
     case "$curl_cv_need_header_malloc_h" in
       yes)
         AC_DEFINE_UNQUOTED(NEED_MALLOC_H, 1,
-          [Define to 1 if you need the malloc.h header file.])
+          [Define to 1 if you need the malloc.h header file even with stdlib.h])
         ;;
     esac
   fi

lib/config-riscos.h

@@ -170,7 +170,7 @@
 /* Define if you have the <malloc.h> header file. */
 #define HAVE_MALLOC_H
 
-/* Define if you need the malloc.h header file. */
+/* Define if you need the malloc.h header file even with stdlib.h  */
 /* #define NEED_MALLOC_H 1 */
 
 /* Define if you have the <memory.h> header file. */

lib/config-tpf.h

@@ -290,7 +290,7 @@
 /* Define to 1 if you have the <malloc.h> header file. */
 /* #undef HAVE_MALLOC_H */
 
-/* Define to 1 if you need the malloc.h header file. */
+/* Define to 1 if you need the malloc.h header file even with stdlib.h  */
 /* #undef NEED_MALLOC_H */
 
 /* Define to 1 if you have the <memory.h> header file. */

lib/config-win32.h

@@ -41,7 +41,7 @@
 #define HAVE_MALLOC_H 1
 #endif
 
-/* Define if you need the malloc.h header file. */
+/* Define if you need the malloc.h header file even with stdlib.h  */
 #ifndef __SALFORDC__
 #define NEED_MALLOC_H 1
 #endif

lib/config-win32ce.h

@@ -39,7 +39,7 @@
 /* Define if you have the <malloc.h> header file.  */
 #define HAVE_MALLOC_H 1
 
-/* Define if you need the malloc.h header file. */
+/* Define if you need the malloc.h header header file even with stdlib.h  */
 #define NEED_MALLOC_H 1
 
 /* Define if you have the <netdb.h> header file.  */

lib/hostares.c

@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H)
+#ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H

lib/hostasyn.c

@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H)
+#ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H

lib/hostip.c

@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H)
+#ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H

lib/hostip4.c

@@ -26,7 +26,7 @@
 #include <string.h>
 #include <errno.h>
 
-#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H)
+#ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H

lib/hostip6.c

@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H)
+#ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H

lib/hostsyn.c

@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H)
+#ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H

lib/hostthre.c

@@ -26,7 +26,7 @@
 #include <string.h>
 #include <errno.h>
 
-#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H)
+#ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H

lib/ldap.c

@@ -36,7 +36,7 @@
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H)
+#ifdef NEED_MALLOC_H
 #include <malloc.h>
 #endif
 #include <errno.h>

packages/vms/config-vms.h

@@ -115,7 +115,7 @@
 /* Define if you have the <malloc.h> header file.  */
 #define HAVE_MALLOC_H 1
 
-/* Define if you need the malloc.h header file. */
+/* Define if you need the malloc.h header header file even with stdlib.h  */
 /* #define NEED_MALLOC_H 1 */
 
 /* Define if you have the <net/if.h> header file.  */

src/config-riscos.h

@@ -176,7 +176,7 @@
 /* Define if you have the <malloc.h> header file. */
 #define HAVE_MALLOC_H
 
-/* Define to 1 if you need the malloc.h header file. */
+/* Define to 1 if you need the malloc.h header file even with stdlib.h */
 /* #define NEED_MALLOC_H 1 */
 
 /* Define if you have the <memory.h> header file. */