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.
This commit is contained in:
Tollef Fog Heen 2009-03-30 21:00:14 +02:00
parent 7e8a4d6c85
commit 2e0493a343
8 changed files with 30 additions and 1 deletions

View file

@ -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.

View file

@ -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])

View file

@ -30,6 +30,10 @@
# endif
#endif
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

4
pkg.c
View file

@ -33,6 +33,10 @@
# endif
#endif
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
#include <sys/types.h>
#include <dirent.h>
#include <string.h>

4
popt.c
View file

@ -29,6 +29,10 @@
# endif
#endif
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
#include <errno.h>
#include <ctype.h>
#include <fcntl.h>

View file

@ -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>

View file

@ -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>

View file

@ -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>