From 40e9aed050e4fac881487fcfb125306fce0431d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Mon, 2 Oct 2006 15:20:37 +0000
Subject: Guard uintptr_t test with HAVE_STDINT_H, test for stdint.h. Will
 backport.

---
 Include/pyport.h |  4 ++++
 configure        | 11 +++++++----
 configure.in     |  8 +++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Include/pyport.h b/Include/pyport.h
index 8f8e514..6fe3f0b 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -3,6 +3,10 @@
 
 #include "pyconfig.h" /* include for defines */
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
 /**************************************************************************
 Symbols and macros to supply platform-independent interfaces to basic
 C language & library operations whose spellings vary across platforms.
diff --git a/configure b/configure
index 27541f1..b455adf 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 51971 .
+# From configure.in Revision: 52086 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.6.
 #
@@ -4631,10 +4631,11 @@ done
 
 
 
+
 for ac_header in asm/types.h conio.h curses.h direct.h dlfcn.h errno.h \
 fcntl.h grp.h \
-shadow.h io.h langinfo.h libintl.h ncurses.h poll.h process.h pthread.h \
-signal.h stropts.h termios.h thread.h \
+io.h langinfo.h libintl.h ncurses.h poll.h process.h pthread.h \
+shadow.h signal.h stdint.h stropts.h termios.h thread.h \
 unistd.h utime.h \
 sys/audioio.h sys/bsdtty.h sys/file.h sys/loadavg.h sys/lock.h sys/mkdev.h \
 sys/modem.h \
@@ -10084,7 +10085,9 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdint.h>
+#ifdef HAVE_STDINT_H
+        #include <stdint.h>
+        #endif
 
 int
 main ()
diff --git a/configure.in b/configure.in
index 6fd8fdf..af95a2e 100644
--- a/configure.in
+++ b/configure.in
@@ -1068,8 +1068,8 @@ dnl AC_MSG_RESULT($cpp_type)
 AC_HEADER_STDC
 AC_CHECK_HEADERS(asm/types.h conio.h curses.h direct.h dlfcn.h errno.h \
 fcntl.h grp.h \
-shadow.h io.h langinfo.h libintl.h ncurses.h poll.h process.h pthread.h \
-signal.h stropts.h termios.h thread.h \
+io.h langinfo.h libintl.h ncurses.h poll.h process.h pthread.h \
+shadow.h signal.h stdint.h stropts.h termios.h thread.h \
 unistd.h utime.h \
 sys/audioio.h sys/bsdtty.h sys/file.h sys/loadavg.h sys/lock.h sys/mkdev.h \
 sys/modem.h \
@@ -1199,7 +1199,9 @@ fi
 
 AC_CHECK_TYPES(uintptr_t, 
    [AC_CHECK_SIZEOF(uintptr_t, 4)], 
-   [], [#include <stdint.h>])
+   [], [#ifdef HAVE_STDINT_H
+        #include <stdint.h>
+        #endif])
 
 
 # Hmph. AC_CHECK_SIZEOF() doesn't include <sys/types.h>.
-- 
cgit v0.12