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

14 files changed, 26 insertions, 8 deletions

diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h
index 89b1650b8..88e8f5c97 100644
--- 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 fd3656f46..a0e6255c4 100644
--- 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 593437cc2..4d1831207 100644
--- 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 891183a14..bda87752e 100644
--- 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 68829ba59..6230fc4ca 100644
--- 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 1ac700d86..2d1295feb 100644
--- 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 9d8ad1ba8..646af5839 100644
--- 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 63d138934..f7f7b6a8f 100644
--- 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 7f071efb2..21d2297fa 100644
--- 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 4e57d3e80..51eca67fe 100644
--- 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 b36d62d4c..eb7c654a1 100644
--- 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 fecde5f63..8cf4da81a 100644
--- 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 f55abb690..8162794e6 100644
--- 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 558d6f40f..dc62c81e9 100644
--- 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>