mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-21 09:21:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix test for uintptr_t. Fixes #1568842.

Browse source
This commit is contained in:
Martin v. Löwis 2006-10-02 14:56:15 +00:00
parent 0988904df8
commit da70fd1599
4 changed files with 32 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -183,6 +183,8 @@ Tools
Build Build
----- -----
- Bug #1568842: Fix test for uintptr_t.
- Patch #1540470, for OpenBSD 4.0. - Patch #1540470, for OpenBSD 4.0.
- Patch #1545507: Exclude ctypes package in Win64 MSI file. - Patch #1545507: Exclude ctypes package in Win64 MSI file.

42
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 51727 . # From configure.in Revision: 51998 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for python 2.5. # Generated by GNU Autoconf 2.59 for python 2.5.
# #
@ -10073,20 +10073,26 @@ _ACEOF
fi fi
echo "$as_me:$LINENO: checking for uintptr_t support" >&5 echo "$as_me:$LINENO: checking for uintptr_t" >&5
echo $ECHO_N "checking for uintptr_t support... $ECHO_C" >&6 echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6
have_uintptr_t=no if test "${ac_cv_type_uintptr_t+set}" = set; then
cat >conftest.$ac_ext <<_ACEOF echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#include <stdint.h>
int int
main () main ()
{ {
uintptr_t x; x = (uintptr_t)0; if ((uintptr_t *) 0)
return 0;
if (sizeof (uintptr_t))
return 0;
; ;
return 0; return 0;
} }
@ -10113,23 +10119,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
ac_cv_type_uintptr_t=yes
cat >>confdefs.h <<\_ACEOF
#define HAVE_UINTPTR_T 1
_ACEOF
have_uintptr_t=yes
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_type_uintptr_t=no
fi fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $have_uintptr_t" >&5 fi
echo "${ECHO_T}$have_uintptr_t" >&6 echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5
if test "$have_uintptr_t" = yes ; then echo "${ECHO_T}$ac_cv_type_uintptr_t" >&6
if test $ac_cv_type_uintptr_t = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_UINTPTR_T 1
_ACEOF
echo "$as_me:$LINENO: checking for uintptr_t" >&5 echo "$as_me:$LINENO: checking for uintptr_t" >&5
echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6 echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6
if test "${ac_cv_type_uintptr_t+set}" = set; then if test "${ac_cv_type_uintptr_t+set}" = set; then
@ -10546,6 +10552,8 @@ _ACEOF
fi fi
# Hmph. AC_CHECK_SIZEOF() doesn't include <sys/types.h>. # Hmph. AC_CHECK_SIZEOF() doesn't include <sys/types.h>.
echo "$as_me:$LINENO: checking size of off_t" >&5 echo "$as_me:$LINENO: checking size of off_t" >&5
echo $ECHO_N "checking size of off_t... $ECHO_C" >&6 echo $ECHO_N "checking size of off_t... $ECHO_C" >&6

14
configure.in
View file

@ -1197,16 +1197,10 @@ if test "$have_long_long" = yes ; then
AC_CHECK_SIZEOF(long long, 8) AC_CHECK_SIZEOF(long long, 8)
fi fi
AC_MSG_CHECKING(for uintptr_t support) AC_CHECK_TYPES(uintptr_t,
have_uintptr_t=no [AC_CHECK_SIZEOF(uintptr_t, 4)],
AC_TRY_COMPILE([], [uintptr_t x; x = (uintptr_t)0;], [ [], [#include <stdint.h>])
AC_DEFINE(HAVE_UINTPTR_T, 1, [Define this if you have the type uintptr_t.])
have_uintptr_t=yes
])
AC_MSG_RESULT($have_uintptr_t)
if test "$have_uintptr_t" = yes ; then
AC_CHECK_SIZEOF(uintptr_t, 4)
fi
# Hmph. AC_CHECK_SIZEOF() doesn't include <sys/types.h>. # Hmph. AC_CHECK_SIZEOF() doesn't include <sys/types.h>.
AC_MSG_CHECKING(size of off_t) AC_MSG_CHECKING(size of off_t)

2
pyconfig.h.in
View file

@ -677,7 +677,7 @@
/* Define this if you have tcl and TCL_UTF_MAX==6 */ /* Define this if you have tcl and TCL_UTF_MAX==6 */
#undef HAVE_UCS4_TCL #undef HAVE_UCS4_TCL
/* Define this if you have the type uintptr_t. */ /* Define to 1 if the system has the type `uintptr_t'. */
#undef HAVE_UINTPTR_T #undef HAVE_UINTPTR_T
/* Define to 1 if you have the `uname' function. */ /* Define to 1 if you have the `uname' function. */