From: Segev Finer <segev208@gmail.com>
Date: Tue, 25 Jul 2017 17:20:51 +0000 (+0300)
Subject: [3.5] bpo-31018: Switch to GH-pragma pack from __declspec(align) (GH-2848) (#2869)
X-Git-Tag: v3.5.4~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49175b3b670a4514b5dc5dcf7b58203d2be852c1;p=thirdparty%2FPython%2Fcpython.git

[3.5] bpo-31018: Switch to GH-pragma pack from __declspec(align) (GH-2848) (#2869)

(cherry picked from commit 39243779f4c97ec6f700fa73c007ca66dfa9408e)
---

diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c
index a923e798c12a..e2a8e692b889 100644
--- a/Modules/_tracemalloc.c
+++ b/Modules/_tracemalloc.c
@@ -62,12 +62,15 @@ typedef struct
 #ifdef __GNUC__
 __attribute__((packed))
 #elif defined(_MSC_VER)
-_declspec(align(4))
+#pragma pack(push, 4)
 #endif
 {
     PyObject *filename;
     unsigned int lineno;
 } frame_t;
+#ifdef _MSC_VER
+#pragma pack(pop)
+#endif
 
 typedef struct {
     Py_uhash_t hash;