From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 11 Feb 2015 13:23:46 +0000 (+0100)
Subject: Merge 3.4 (faulthandler)
X-Git-Tag: v3.5.0a2~171
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=385efb4d9942ad483c7f866633ee735a2ec5003f;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4 (faulthandler)
---

385efb4d9942ad483c7f866633ee735a2ec5003f
diff --cc Modules/faulthandler.c
index 568724b6f171,01e7beb25500..6f7c71de1e1d
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@@ -945,9 -929,9 +945,10 @@@ static PyObject 
  faulthandler_stack_overflow(PyObject *self)
  {
      size_t depth, size;
-     char *sp = (char *)&depth, *stop;
+     Py_uintptr_t sp = (Py_uintptr_t)&depth;
+     Py_uintptr_t stop;
  
 +    faulthandler_suppress_crash_report();
      depth = 0;
      stop = stack_overflow(sp - STACK_OVERFLOW_MAX_SIZE,
                            sp + STACK_OVERFLOW_MAX_SIZE,