re PR other/39062 (libssp/ssp.c needs malloc.h for mingw)

2009-04-13  Ozkan Sezer  <sezeroz@gmail.com>

        PR target/39062
        * ssp.c: Also include malloc.h for alloca(). MinGW needs it.
        * configure.ac: Also check for malloc.h.
        * configure: Regenerated.
        * config.h.in: Regenerated.

From-SVN: r146000

diff --git a/libssp/ChangeLog b/libssp/ChangeLog
index 0276535d9dfe874c119f95bfad578eb836f7d0e9..d8d3c7410c0b64239d48225781293309c0545ad4 100644 (file)
--- a/libssp/ChangeLog
+++ b/libssp/ChangeLog
@@ -1,3 +1,11 @@
+2009-04-13  Ozkan Sezer  <sezeroz@gmail.com>
+
+       PR target/39062
+       * ssp.c: Also include malloc.h for alloca(). MinGW needs it.
+       * configure.ac: Also check for malloc.h.
+       * configure: Regenerated.
+       * config.h.in: Regenerated.
+
 2009-04-09  Nick Clifton  <nickc@redhat.com>
 
        * strcat-chk.c: Change copyright header to refer to version 3

diff --git a/libssp/config.h.in b/libssp/config.h.in
index 501a4f37ec2ccc44265519b212d0a87b05c29a16..91c59890292bc4422ceaf5f2c27797ee0ecabd3c 100644 (file)
--- a/libssp/config.h.in
+++ b/libssp/config.h.in
@@ -3,6 +3,9 @@
 /* Define to 1 if you have the <alloca.h> header file. */
 #undef HAVE_ALLOCA_H
 
+/* Define to 1 if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 

diff --git a/libssp/configure b/libssp/configure
index ee2a41fd495a62f75c40562f47ff9d781ab01426..7276c0b0cf9d4d8c931016f266173832ff17a770 100755 (executable)
--- a/libssp/configure
+++ b/libssp/configure
@@ -3989,7 +3989,7 @@ done
 
 
 
-for ac_header in alloca.h paths.h syslog.h string.h unistd.h fcntl.h stdio.h limits.h
+for ac_header in alloca.h malloc.h paths.h syslog.h string.h unistd.h fcntl.h stdio.h limits.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then

diff --git a/libssp/configure.ac b/libssp/configure.ac
index 99b4edfe1049c6468d9b5e3b3389dd6b3eb6e6ee..f3a66ec975a418976857ee38b7448979d990dcde 100644 (file)
--- a/libssp/configure.ac
+++ b/libssp/configure.ac
@@ -90,7 +90,7 @@ LDFLAGS="$save_LDFLAGS"
 AC_MSG_RESULT($ssp_use_symver)
 AM_CONDITIONAL(LIBSSP_USE_SYMVER, [test "x$ssp_use_symver" = xyes])
 
-AC_CHECK_HEADERS(alloca.h paths.h syslog.h string.h unistd.h fcntl.h stdio.h limits.h)
+AC_CHECK_HEADERS(alloca.h malloc.h paths.h syslog.h string.h unistd.h fcntl.h stdio.h limits.h)
 
 if test x$gcc_no_link = xyes; then
   # Presume the ISO C functions are available; add target-specific

diff --git a/libssp/ssp.c b/libssp/ssp.c
index e7babe2179edce64e36152951213f0d5286322d8..aaa5a322c8de59a3d98ba942ab952af5a49bbfcf 100644 (file)
--- a/libssp/ssp.c
+++ b/libssp/ssp.c
@@ -36,6 +36,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
 #endif
+#ifdef HAVE_MALLOC_H
+# include <malloc.h>
+#endif
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif