diff options
| author | Segev Finer <segev208@gmail.com> | 2017-07-25 17:20:38 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2017-07-25 17:20:38 (GMT) |
| commit | d8b5216f998bbb0f921815165f46918b86620ab7 (patch) | |
| tree | 96859c542bbe81494c9e2ca628ec103a66e558af | |
| parent | 548a6889f4d5cbc3c470b118fae1316adc75826b (diff) | |
| download | cpython-d8b5216f998bbb0f921815165f46918b86620ab7.zip cpython-d8b5216f998bbb0f921815165f46918b86620ab7.tar.gz cpython-d8b5216f998bbb0f921815165f46918b86620ab7.tar.bz2 | |
[3.6] bpo-31018: Switch to GH-pragma pack from __declspec(align) (GH-2848) (#2868)
(cherry picked from commit 39243779f4c97ec6f700fa73c007ca66dfa9408e)
| -rw-r--r-- | Modules/_tracemalloc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c index 0ce38ff..4f3bb54 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: "<unknown>" 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 { |