[Python-checkins] r50892 - python/branches/bcannon-sandboxing/configure python/branches/bcannon-sandboxing/configure.in python/branches/bcannon-sandboxing/pyconfig.h.in

brett.cannon python-checkins at python.org
Fri Jul 28 04:40:10 CEST 2006


Author: brett.cannon
Date: Fri Jul 28 04:40:07 2006
New Revision: 50892

Modified:
   python/branches/bcannon-sandboxing/configure
   python/branches/bcannon-sandboxing/configure.in
   python/branches/bcannon-sandboxing/pyconfig.h.in
Log:
Remove malloc_usable_size() check.  The function didn't work properly.


Modified: python/branches/bcannon-sandboxing/configure
==============================================================================
--- python/branches/bcannon-sandboxing/configure	(original)
+++ python/branches/bcannon-sandboxing/configure	Fri Jul 28 04:40:07 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 50730 .
+# From configure.in Revision: 50891 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.5.
 #
@@ -20455,70 +20455,6 @@
 
 fi
 
-echo "$as_me:$LINENO: checking for good malloc_usable_size()" >&5
-echo $ECHO_N "checking for good malloc_usable_size()... $ECHO_C" >&6
-if test "${ac_cv_good_malloc_usable_size+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-if test "$cross_compiling" = yes; then
-  ac_cv_good_malloc_usable_size=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <stdlib.h>
-#include <malloc.h>
-int
-main()
-{
-	void *p = malloc(8);
-	if (malloc_usable_size(p) <= 16)
-		exit(0);
-	exit(1);
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_good_malloc_usable_size=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_good_malloc_usable_size=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-
-echo "$as_me:$LINENO: result: $ac_cv_good_malloc_usable_size" >&5
-echo "${ECHO_T}$ac_cv_good_malloc_usable_size" >&6
-if test "$ac_cv_good_malloc_usable_size" = yes
-then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MALLOC_USABLE_SIZE 1
-_ACEOF
-
-fi
-
-
 # check where readline lives
 # save the value of LIBS so we don't actually link Python with readline
 LIBS_no_readline=$LIBS

Modified: python/branches/bcannon-sandboxing/configure.in
==============================================================================
--- python/branches/bcannon-sandboxing/configure.in	(original)
+++ python/branches/bcannon-sandboxing/configure.in	Fri Jul 28 04:40:07 2006
@@ -3055,31 +3055,6 @@
   [Define this if you have flockfile(), getc_unlocked(), and funlockfile()])
 fi
 
-AC_MSG_CHECKING(for good malloc_usable_size())
-AC_CACHE_VAL(ac_cv_good_malloc_usable_size, [
-AC_TRY_RUN([
-#include <stdlib.h>
-#include <malloc.h>
-int
-main()
-{
-	void *p = malloc(8);
-	if (malloc_usable_size(p) <= 16)
-		exit(0);
-	exit(1);
-}
-],
-ac_cv_good_malloc_usable_size=yes,
-ac_cv_good_malloc_usable_size=no,
-ac_cv_good_malloc_usable_size=no)])
-AC_MSG_RESULT($ac_cv_good_malloc_usable_size)
-if test "$ac_cv_good_malloc_usable_size" = yes
-then
-  AC_DEFINE(HAVE_MALLOC_USABLE_SIZE, 1,
-  [Define if malloc_usable_size() exists and works.])
-fi
-
-
 # check where readline lives
 # save the value of LIBS so we don't actually link Python with readline
 LIBS_no_readline=$LIBS

Modified: python/branches/bcannon-sandboxing/pyconfig.h.in
==============================================================================
--- python/branches/bcannon-sandboxing/pyconfig.h.in	(original)
+++ python/branches/bcannon-sandboxing/pyconfig.h.in	Fri Jul 28 04:40:07 2006
@@ -326,9 +326,6 @@
 /* Define this if you have the makedev macro. */
 #undef HAVE_MAKEDEV
 
-/* Define if malloc_usable_size() exists and works. */
-#undef HAVE_MALLOC_USABLE_SIZE
-
 /* Define to 1 if you have the `memmove' function. */
 #undef HAVE_MEMMOVE
 


More information about the Python-checkins mailing list