From: Yang Tse <yangsita@gmail.com>
Date: Tue, 25 Jul 2006 13:49:49 +0000 (+0000)
Subject: Simplify check for NEED_MALLOC_H, and make more explicit that NEED_MALLOC_H shall... 
X-Git-Tag: curl-7_15_5~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13616f8f96b12bbbec1ca40ea4356560a456cc11;p=thirdparty%2Fcurl.git

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>.
---

diff --git a/acinclude.m4 b/acinclude.m4
index 99cd331a3c..2dfc7e1ca8 100644
--- 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 4db7a360da..a282bb0a2b 100644
--- 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 a0e6255c4e..bb4bafba54 100644
--- 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 4d18312078..5deb112d2e 100644
--- 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 bda87752ec..33322c839d 100644
--- 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 6230fc4caa..f9796a302d 100644
--- 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 25a15be913..035d0e2229 100644
--- 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 5efd8320bd..3df147910a 100644
--- 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 f722747abb..b433138547 100644
--- 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 936e436dc5..a45d105805 100644
--- 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 a1bc966c12..7ea632a636 100644
--- 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 8cf4da81a1..2f816b8583 100644
--- 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 65c09372ef..16349847ea 100644
--- 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 dc62c81e97..7b92587d7e 100644
--- 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 3067ce63d5..7c61e2a97f 100644
--- 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 b7473a15ab..ceab565c1b 100644
--- 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. */