From 13616f8f96b12bbbec1ca40ea4356560a456cc11 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 25 Jul 2006 13:49:49 +0000 Subject: Simplify check for NEED_MALLOC_H, and make more explicit that NEED_MALLOC_H shall be defined if header file must be included even when including . --- acinclude.m4 | 2 +- ares/acinclude.m4 | 2 +- lib/config-riscos.h | 2 +- lib/config-tpf.h | 2 +- lib/config-win32.h | 2 +- lib/config-win32ce.h | 2 +- lib/hostares.c | 2 +- lib/hostasyn.c | 2 +- lib/hostip.c | 2 +- lib/hostip4.c | 2 +- lib/hostip6.c | 2 +- lib/hostsyn.c | 2 +- lib/hostthre.c | 2 +- lib/ldap.c | 2 +- packages/vms/config-vms.h | 2 +- src/config-riscos.h | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 99cd331a3..2dfc7e1ca 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 4db7a360d..a282bb0a2 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 a0e6255c4..bb4bafba5 100644 --- a/lib/config-riscos.h +++ b/lib/config-riscos.h @@ -170,7 +170,7 @@ /* Define if you have the 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 header file. */ diff --git a/lib/config-tpf.h b/lib/config-tpf.h index 4d1831207..5deb112d2 100644 --- a/lib/config-tpf.h +++ b/lib/config-tpf.h @@ -290,7 +290,7 @@ /* Define to 1 if you have the 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 header file. */ diff --git a/lib/config-win32.h b/lib/config-win32.h index bda87752e..33322c839 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 6230fc4ca..f9796a302 100644 --- a/lib/config-win32ce.h +++ b/lib/config-win32ce.h @@ -39,7 +39,7 @@ /* Define if you have the 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 header file. */ diff --git a/lib/hostares.c b/lib/hostares.c index 25a15be91..035d0e222 100644 --- a/lib/hostares.c +++ b/lib/hostares.c @@ -25,7 +25,7 @@ #include -#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H) +#ifdef NEED_MALLOC_H #include #endif #ifdef HAVE_SYS_TYPES_H diff --git a/lib/hostasyn.c b/lib/hostasyn.c index 5efd8320b..3df147910 100644 --- a/lib/hostasyn.c +++ b/lib/hostasyn.c @@ -25,7 +25,7 @@ #include -#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H) +#ifdef NEED_MALLOC_H #include #endif #ifdef HAVE_SYS_TYPES_H diff --git a/lib/hostip.c b/lib/hostip.c index f722747ab..b43313854 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -25,7 +25,7 @@ #include -#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H) +#ifdef NEED_MALLOC_H #include #endif #ifdef HAVE_SYS_TYPES_H diff --git a/lib/hostip4.c b/lib/hostip4.c index 936e436dc..a45d10580 100644 --- a/lib/hostip4.c +++ b/lib/hostip4.c @@ -26,7 +26,7 @@ #include #include -#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H) +#ifdef NEED_MALLOC_H #include #endif #ifdef HAVE_SYS_TYPES_H diff --git a/lib/hostip6.c b/lib/hostip6.c index a1bc966c1..7ea632a63 100644 --- a/lib/hostip6.c +++ b/lib/hostip6.c @@ -25,7 +25,7 @@ #include -#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H) +#ifdef NEED_MALLOC_H #include #endif #ifdef HAVE_SYS_TYPES_H diff --git a/lib/hostsyn.c b/lib/hostsyn.c index 8cf4da81a..2f816b858 100644 --- a/lib/hostsyn.c +++ b/lib/hostsyn.c @@ -25,7 +25,7 @@ #include -#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H) +#ifdef NEED_MALLOC_H #include #endif #ifdef HAVE_SYS_TYPES_H diff --git a/lib/hostthre.c b/lib/hostthre.c index 65c09372e..16349847e 100644 --- a/lib/hostthre.c +++ b/lib/hostthre.c @@ -26,7 +26,7 @@ #include #include -#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H) +#ifdef NEED_MALLOC_H #include #endif #ifdef HAVE_SYS_TYPES_H diff --git a/lib/ldap.c b/lib/ldap.c index dc62c81e9..7b92587d7 100644 --- a/lib/ldap.c +++ b/lib/ldap.c @@ -36,7 +36,7 @@ #ifdef HAVE_SYS_STAT_H #include #endif -#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H) +#ifdef NEED_MALLOC_H #include #endif #include diff --git a/packages/vms/config-vms.h b/packages/vms/config-vms.h index 3067ce63d..7c61e2a97 100644 --- a/packages/vms/config-vms.h +++ b/packages/vms/config-vms.h @@ -115,7 +115,7 @@ /* Define if you have the 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 header file. */ diff --git a/src/config-riscos.h b/src/config-riscos.h index b7473a15a..ceab565c1 100644 --- a/src/config-riscos.h +++ b/src/config-riscos.h @@ -176,7 +176,7 @@ /* Define if you have the 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 header file. */ -- cgit v1.2.3