include <malloc.h> only if HAVE_MALLOC_H and NEED_MALLOC_H are both defined.

diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h
index 89b1650b8c06b2715e8a86cbc628606374f1eed0..88e8f5c97088a9aff225385a4bfd2bbd621d50bf 100644 (file)
--- a/lib/config-amigaos.h
+++ b/lib/config-amigaos.h
@@ -56,6 +56,8 @@
 #define HAVE_ZLIB_H 1
 #define HAVE_SYS_IOCTL_H 1
 
+#define NEED_MALLOC_H 1
+
 #define USE_OPENSSL 1
 #define USE_SSLEAY 1
 #define CURL_DISABLE_LDAP 1

diff --git a/lib/config-riscos.h b/lib/config-riscos.h
index fd3656f461c71146098c3a672d2d30e684ef4d8c..a0e6255c4ee44bf201d5364272fa6159bdf4e8fc 100644 (file)
--- a/lib/config-riscos.h
+++ b/lib/config-riscos.h
@@ -170,6 +170,9 @@
 /* Define if you have the <malloc.h> header file. */
 #define HAVE_MALLOC_H
 
+/* Define if you need the malloc.h header file. */
+/* #define NEED_MALLOC_H 1 */
+
 /* Define if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 

diff --git a/lib/config-tpf.h b/lib/config-tpf.h
index 593437cc2cb32acda300652621beb5d8c3423fd2..4d18312078b4b3d9f1532fcf0a43897807490c11 100644 (file)
--- a/lib/config-tpf.h
+++ b/lib/config-tpf.h
@@ -290,6 +290,9 @@
 /* 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. */
+/* #undef NEED_MALLOC_H */
+
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 

diff --git a/lib/config-win32.h b/lib/config-win32.h
index 891183a14cc458a42f7e8b7aeae206092190c0dc..bda87752ecc7c05eaba92777cf93eac8e7488852 100644 (file)
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -41,6 +41,11 @@
 #define HAVE_MALLOC_H 1
 #endif
 
+/* Define if you need the malloc.h header file. */
+#ifndef __SALFORDC__
+#define NEED_MALLOC_H 1
+#endif
+
 /* Define if you have the <netdb.h> header file.  */
 /* #define HAVE_NETDB_H 1 */
 

diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h
index 68829ba5924d494e6d14cdef4a13905aa2c69fcc..6230fc4caa298bf297c4678042be94f3b069688e 100644 (file)
--- a/lib/config-win32ce.h
+++ b/lib/config-win32ce.h
@@ -39,6 +39,9 @@
 /* Define if you have the <malloc.h> header file.  */
 #define HAVE_MALLOC_H 1
 
+/* Define if you need the malloc.h header file. */
+#define NEED_MALLOC_H 1
+
 /* Define if you have the <netdb.h> header file.  */
 /* #define HAVE_NETDB_H 1 */
 

diff --git a/lib/config.dj b/lib/config.dj
index 1ac700d867392d39981d86ff763cae8e1973adc0..2d1295febb713b37cfba01116d90630c906bc35b 100644 (file)
--- a/lib/config.dj
+++ b/lib/config.dj
@@ -70,6 +70,8 @@
 #define HAVE_UNISTD_H          1
 #define HAVE_VPRINTF           1
 
+#define NEED_MALLOC_H          1
+
 #if (DJGPP_MINOR >= 4)
 #define HAVE_STRLCAT           1
 #endif

diff --git a/lib/hostares.c b/lib/hostares.c
index 9d8ad1ba81ca6cb7887307b6b7072486a6bc2a72..646af5839ce557acc7c371d219ea42d27d8e27ac 100644 (file)
--- a/lib/hostares.c
+++ b/lib/hostares.c
@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#ifdef HAVE_MALLOC_H  /* Win32 */
+#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H)
 #include <malloc.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H

diff --git a/lib/hostasyn.c b/lib/hostasyn.c
index 63d138934a778a0fbcafcf9c8f09755841e0c45d..f7f7b6a8ff76bff75e5592aab2570914df58c038 100644 (file)
--- a/lib/hostasyn.c
+++ b/lib/hostasyn.c
@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#ifdef HAVE_MALLOC_H  /* Win32 */
+#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H)
 #include <malloc.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H

diff --git a/lib/hostip.c b/lib/hostip.c
index 7f071efb20f866f15499c30c5945b6188af584bc..21d2297fa57970aa14b36b87ef3bc7a28c28fe37 100644 (file)
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#ifdef HAVE_MALLOC_H  /* Win32 */
+#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H)
 #include <malloc.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H

diff --git a/lib/hostip4.c b/lib/hostip4.c
index 4e57d3e80cbcbbf9f7f26924e5c8f239e4f697b7..51eca67fe8bc0d58cbeae53c7e4bef7351ef0010 100644 (file)
--- a/lib/hostip4.c
+++ b/lib/hostip4.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <errno.h>
 
-#ifdef HAVE_MALLOC_H  /* Win32 */
+#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H)
 #include <malloc.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H

diff --git a/lib/hostip6.c b/lib/hostip6.c
index b36d62d4cf992eadc05fa91d09dc1d06b1dd6448..eb7c654a1572d975b2cc7f480c274df20a1ec78a 100644 (file)
--- a/lib/hostip6.c
+++ b/lib/hostip6.c
@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#ifdef HAVE_MALLOC_H
+#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H)
 #include <malloc.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H

diff --git a/lib/hostsyn.c b/lib/hostsyn.c
index fecde5f63526733da1be08d1263ec571b6cef46a..8cf4da81a1f9a39cfda7106602caca402c90e180 100644 (file)
--- a/lib/hostsyn.c
+++ b/lib/hostsyn.c
@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#ifdef HAVE_MALLOC_H
+#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H)
 #include <malloc.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H

diff --git a/lib/hostthre.c b/lib/hostthre.c
index f55abb69054ed8e2e1c87aaa9450fbd1d4d7472a..8162794e6d0865843a4f7893ccc0399eae6ba266 100644 (file)
--- a/lib/hostthre.c
+++ b/lib/hostthre.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <errno.h>
 
-#ifdef HAVE_MALLOC_H
+#if defined(HAVE_MALLOC_H) && defined(NEED_MALLOC_H)
 #include <malloc.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H

diff --git a/lib/ldap.c b/lib/ldap.c
index 558d6f40f6671358be58657a01a3b30008ab45bb..dc62c81e9709426967d16f84f4e6441e7a9f89cc 100644 (file)
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -36,7 +36,7 @@
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#ifdef HAVE_MALLOC_H
+#if defined(HAVE_MALLOC_H) && defined(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 b8da732a9b9536a314f304b8634a573fb5e9fd52..3067ce63d5d2b2bf1fbfeff1fb5c639bd72992a8 100644 (file)
--- a/packages/vms/config-vms.h
+++ b/packages/vms/config-vms.h
@@ -115,6 +115,9 @@
 /* Define if you have the <malloc.h> header file.  */
 #define HAVE_MALLOC_H 1
 
+/* Define if you need the malloc.h header file. */
+/* #define NEED_MALLOC_H 1 */
+
 /* Define if you have the <net/if.h> header file.  */
 #define HAVE_NET_IF_H 1
 

diff --git a/src/config-riscos.h b/src/config-riscos.h
index 3213364793d795675ab5549b75f4ed7581342fa6..b7473a15abb4d31da789890a09f2c4d12f6cc6b4 100644 (file)
--- a/src/config-riscos.h
+++ b/src/config-riscos.h
@@ -176,6 +176,9 @@
 /* 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 NEED_MALLOC_H 1 */
+
 /* Define if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H