[Python-checkins] cpython (merge default -> default): Merge

[antoine.pitrou]

http://hg.python.org/cpython/rev/9b7b8b7ccf28
changeset:   86263:9b7b8b7ccf28
parent:      86261:e45cb197f207
parent:      86262:0383f08bff4c
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Oct 12 23:16:32 2013 +0200
summary:
  Merge

files:
  Python/marshal.c |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Python/marshal.c b/Python/marshal.c
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -83,7 +83,7 @@
                            else w_more(c, p)
 
 static void
-w_more(int c, WFILE *p)
+w_more(char c, WFILE *p)
 {
     Py_ssize_t size, newsize;
     if (p->str == NULL)
@@ -100,7 +100,7 @@
         p->ptr = PyBytes_AS_STRING((PyBytesObject *)p->str) + size;
         p->end =
             PyBytes_AS_STRING((PyBytesObject *)p->str) + newsize;
-        *p->ptr++ = Py_SAFE_DOWNCAST(c, int, char);
+        *p->ptr++ = c;
     }
 }
 
@@ -159,7 +159,7 @@
 static void
 w_short_pstring(const char *s, Py_ssize_t n, WFILE *p)
 {
-    w_byte(n, p);
+    w_byte(Py_SAFE_DOWNCAST(n, Py_ssize_t, unsigned char), p);
     w_string(s, n, p);
 }
 

-- 
Repository URL: http://hg.python.org/cpython