From d8b5216f998bbb0f921815165f46918b86620ab7 Mon Sep 17 00:00:00 2001 From: Segev Finer Date: Tue, 25 Jul 2017 20:20:38 +0300 Subject: [PATCH] [3.6] bpo-31018: Switch to GH-pragma pack from __declspec(align) (GH-2848) (#2868) (cherry picked from commit 39243779f4c97ec6f700fa73c007ca66dfa9408e) --- Modules/_tracemalloc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c index 0ce38ffc78c5..4f3bb5463f03 100644 --- a/Modules/_tracemalloc.c +++ b/Modules/_tracemalloc.c @@ -77,7 +77,7 @@ typedef struct #ifdef __GNUC__ __attribute__((packed)) #elif defined(_MSC_VER) -_declspec(align(4)) +#pragma pack(push, 4) #endif { /* filename cannot be NULL: "" is used if the Python frame @@ -85,6 +85,9 @@ _declspec(align(4)) PyObject *filename; unsigned int lineno; } frame_t; +#ifdef _MSC_VER +#pragma pack(pop) +#endif typedef struct { -- 2.47.3