2009-03-30 Tollef Fog Heen <tfheen@err.no>

	* poptparse.c, popthelp.c, poptconfig.c, popt.c, pkg.c, findme.c,
	configure.in: Check for malloc.h and use that if it exists.
	Apparently this makes Win32 happier.  Thanks to Carlo Bramini for
	the patch.

8 files changed, 30 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index ccfedee..3caec4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-03-30  Tollef Fog Heen  <tfheen@err.no>
 
+	* poptparse.c, popthelp.c, poptconfig.c, popt.c, pkg.c, findme.c,
+	configure.in: Check for malloc.h and use that if it exists.
+	Apparently this makes Win32 happier.  Thanks to Carlo Bramini for
+	the patch.
+
 	* pkg-config.1: Verbosify the text about Libs.private a bit. Patch
 	from Loïc Minier.
 
diff --git a/configure.in b/configure.in
index e7cf124..d118cc6 100644
--- a/configure.in
+++ b/configure.in
@@ -137,6 +137,6 @@ fi # !native_win32
 AC_FUNC_ALLOCA
 
 AC_CHECK_FUNCS(setresuid setreuid,break)
-AC_CHECK_HEADERS([dirent.h unistd.h sys/wait.h])
+AC_CHECK_HEADERS([dirent.h unistd.h sys/wait.h malloc.h])
 
 AC_OUTPUT([Makefile check/Makefile])
diff --git a/findme.c b/findme.c
index be72e63..b12e96d 100644
--- a/findme.c
+++ b/findme.c
@@ -30,6 +30,10 @@
 # endif
 #endif
 
+#ifdef HAVE_MALLOC_H
+# include <malloc.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/pkg.c b/pkg.c
index 1ee179e..81cbc3e 100644
--- a/pkg.c
+++ b/pkg.c
@@ -33,6 +33,10 @@
 # endif
 #endif
 
+#ifdef HAVE_MALLOC_H
+# include <malloc.h>
+#endif
+
 #include <sys/types.h>
 #include <dirent.h>
 #include <string.h>
diff --git a/popt.c b/popt.c
index 8b3da9a..7d0e3bb 100644
--- a/popt.c
+++ b/popt.c
@@ -29,6 +29,10 @@
 # endif
 #endif
 
+#ifdef HAVE_MALLOC_H
+# include <malloc.h>
+#endif
+
 #include <errno.h>
 #include <ctype.h>
 #include <fcntl.h>
diff --git a/poptconfig.c b/poptconfig.c
index a3a085d..1492dd6 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -35,6 +35,10 @@ in this Software without prior written authorization from the X Consortium.
 # endif
 #endif
 
+#ifdef HAVE_MALLOC_H
+# include <malloc.h>
+#endif
+
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/popthelp.c b/popthelp.c
index 8fa68d1..1490c78 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -35,6 +35,10 @@ in this Software without prior written authorization from the X Consortium.
 # endif
 #endif
 
+#ifdef HAVE_MALLOC_H
+# include <malloc.h>
+#endif
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/poptparse.c b/poptparse.c
index 16d75a2..18087fb 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -35,6 +35,10 @@ in this Software without prior written authorization from the X Consortium.
 # endif
 #endif
 
+#ifdef HAVE_MALLOC_H
+# include <malloc.h>
+#endif
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>