Simplify check for NEED_MALLOC_H, and make more explicit that NEED_MALLOC_H shall...

diff --git a/acinclude.m4 b/acinclude.m4
index 99cd331a3c2ae18f46deb0ccab74ff808259070e..2dfc7e1ca83f103aec4b38baad881eac42b563f9 100644 (file)
--- a/acinclude.m4
+++ b/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

diff --git a/ares/acinclude.m4 b/ares/acinclude.m4
index 4db7a360dab4c64cba34230aec6f1255d6ecd613..a282bb0a2bba653e1c48dfbfdca8504ec6ab1792 100644 (file)
--- a/ares/acinclude.m4
+++ b/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

diff --git a/lib/config-riscos.h b/lib/config-riscos.h
index a0e6255c4ee44bf201d5364272fa6159bdf4e8fc..bb4bafba5408fdfa962edfafd7a138e991fb3164 100644 (file)
--- a/lib/config-riscos.h
+++ b/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. */

diff --git a/lib/config-tpf.h b/lib/config-tpf.h
index 4d18312078b4b3d9f1532fcf0a43897807490c11..5deb112d2e5ae3892c73d5d9c8780ef62f65ee35 100644 (file)
--- a/lib/config-tpf.h
+++ b/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. */

diff --git a/lib/config-win32.h b/lib/config-win32.h
index bda87752ecc7c05eaba92777cf93eac8e7488852..33322c839d062dfa7f797fa80715ca5cf5e5fa97 100644 (file)
--- a/lib/config-win32.h
+++ b/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

diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h
index 6230fc4caa298bf297c4678042be94f3b069688e..f9796a302dd54473a0ce547f69edc7548e0c9931 100644 (file)
--- a/lib/config-win32ce.h
+++ b/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.  */

diff --git a/lib/hostares.c b/lib/hostares.c
index 25a15be913eb482ed43a806fcf8715a72a8c50a8..035d0e222949b765e01945fa3a9649e13b0580a5 100644 (file)
--- a/lib/hostares.c
+++ b/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

diff --git a/lib/hostasyn.c b/lib/hostasyn.c
index 5efd8320bda01ff5c4ce89329ff6d3ee6a722a24..3df147910adbff3bed29263f96b0fab5f7446d86 100644 (file)
--- a/lib/hostasyn.c
+++ b/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

diff --git a/lib/hostip.c b/lib/hostip.c
index f722747abb76ff791238b257e377cab604d1ed1c..b43313854781329c22f54dba2c9f4ccf2fe378e1 100644 (file)
--- a/lib/hostip.c
+++ b/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

diff --git a/lib/hostip4.c b/lib/hostip4.c
index 936e436dc5989d2f1cd43521dda25c57e03e58aa..a45d105805a77029cac093d273ba8fa6bd7dadf0 100644 (file)
--- a/lib/hostip4.c
+++ b/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

diff --git a/lib/hostip6.c b/lib/hostip6.c
index a1bc966c1299cbdb382b9347d4942a9613721d43..7ea632a63678dbc70ff7a38965ecf36ccc6d4962 100644 (file)
--- a/lib/hostip6.c
+++ b/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

diff --git a/lib/hostsyn.c b/lib/hostsyn.c
index 8cf4da81a1f9a39cfda7106602caca402c90e180..2f816b858328e43cfef01914bdf3f88cdcc28425 100644 (file)
--- a/lib/hostsyn.c
+++ b/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

diff --git a/lib/hostthre.c b/lib/hostthre.c
index 65c09372efa70d1a8d1bf10b81cb73287771f236..16349847eaaac8cc8a0658071127a7374df21907 100644 (file)
--- a/lib/hostthre.c
+++ b/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

diff --git a/lib/ldap.c b/lib/ldap.c
index dc62c81e9709426967d16f84f4e6441e7a9f89cc..7b92587d7eaf4e80ed045f36bc7c8095872e172d 100644 (file)
--- a/lib/ldap.c
+++ b/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>

diff --git a/packages/vms/config-vms.h b/packages/vms/config-vms.h
index 3067ce63d5d2b2bf1fbfeff1fb5c639bd72992a8..7c61e2a97f188bd572965ebb3efa983a9458792f 100644 (file)
--- a/packages/vms/config-vms.h
+++ b/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.  */

diff --git a/src/config-riscos.h b/src/config-riscos.h
index b7473a15abb4d31da789890a09f2c4d12f6cc6b4..ceab565c1b42a8ae7389f853b4d28b409395672f 100644 (file)
--- a/src/config-riscos.h
+++ b/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. */