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.

diff --git a/ChangeLog b/ChangeLog
index ccfedee9222dd1325cb0ad3a457de70f540b2b84..3caec4d6b922ca089eddc27360c1301cd91011bb 100644 (file)
--- 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 e7cf12422c572dd101cbbdd5dc8af4a8e4e46a7a..d118cc65a304ea8d45e484dec4893a2b4e88a196 100644 (file)
--- 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 be72e63a7a5ca741857c339ec1819a7bfeb6d5c0..b12e96d6471222dbe086fd2a1667651976ac3d9b 100644 (file)
--- 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 1ee179e0511d5f91e22355f72acc6fad85a14945..81cbc3ee51592419af85384cd428c04f86e85aa0 100644 (file)
--- 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 8b3da9afb4404787ed565d453111d59bd8bc60fd..7d0e3bbdf7ba6f445d0bc2bcf9d490f9420027d9 100644 (file)
--- 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 a3a085de062a1b55472e2d793cf4a6f98cdf7bd5..1492dd62eb9cc0896982f9f86b464068b37b62e3 100644 (file)
--- 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 8fa68d12ecba0c865ee4ee40024479589ef5bb0d..1490c7891f34e2d0210db8d4556a2924bbefbd22 100644 (file)
--- 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 16d75a27f62bdb244ff67a4217a88c0f9b286306..18087fb3d92499d7d16a71f6a678a8c7bbac499a 100644 (file)
--- 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>