From: Victor Stinner Date: Tue, 15 Mar 2016 20:57:23 +0000 (+0100) Subject: Merge 3.5 (_tracemalloc) X-Git-Tag: v3.6.0a1~467 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af584a02a5dee4250e904ff75d22359aee9c2d70;p=thirdparty%2FPython%2Fcpython.git Merge 3.5 (_tracemalloc) --- af584a02a5dee4250e904ff75d22359aee9c2d70 diff --cc Modules/_tracemalloc.c index 2eb4dcad444f,fd520f3259c3..1940af429adf --- a/Modules/_tracemalloc.c +++ b/Modules/_tracemalloc.c @@@ -65,10 -65,8 +65,10 @@@ __attribute__((packed) _declspec(align(4)) #endif { + /* filename cannot be NULL: "" is used if the Python frame + filename is NULL */ PyObject *filename; - int lineno; + unsigned int lineno; } frame_t; typedef struct {