changeset:   89937:004ae1472a43
branch:      3.4
parent:      89934:bb6377db0a9e
user:        Antoine Pitrou <solipsis@pitrou.net>
date:        Sun Mar 23 22:55:03 2014 +0100
files:       Include/unicodeobject.h Misc/ACKS Misc/NEWS
description:
Issue #19537: Fix PyUnicode_DATA() alignment under m68k.  Patch by Andreas Schwab.


diff -r bb6377db0a9e -r 004ae1472a43 Include/unicodeobject.h
--- a/Include/unicodeobject.h	Sun Mar 23 18:44:11 2014 +0000
+++ b/Include/unicodeobject.h	Sun Mar 23 22:55:03 2014 +0100
@@ -343,6 +343,9 @@
            the data pointer is filled out. The bit is redundant, and helps
            to minimize the test in PyUnicode_IS_READY(). */
         unsigned int ready:1;
+        /* Padding to ensure that PyUnicode_DATA() is always aligned to
+           4 bytes (see issue #19537 on m68k). */
+        unsigned int :24;
     } state;
     wchar_t *wstr;              /* wchar_t representation (null-terminated) */
 } PyASCIIObject;
diff -r bb6377db0a9e -r 004ae1472a43 Misc/ACKS
--- a/Misc/ACKS	Sun Mar 23 18:44:11 2014 +0000
+++ b/Misc/ACKS	Sun Mar 23 22:55:03 2014 +0100
@@ -1170,6 +1170,7 @@
 Chad J. Schroeder
 Christian Schubert
 Sam Schulenburg
+Andreas Schwab
 Stefan Schwarzer
 Dietmar Schwertberger
 Federico Schwindt
diff -r bb6377db0a9e -r 004ae1472a43 Misc/NEWS
--- a/Misc/NEWS	Sun Mar 23 18:44:11 2014 +0000
+++ b/Misc/NEWS	Sun Mar 23 22:55:03 2014 +0100
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #19537: Fix PyUnicode_DATA() alignment under m68k.  Patch by
+  Andreas Schwab.
+
 - Issue #20929: Add a type cast to avoid shifting a negative number.
 
 - Issue #20731: Properly position in source code files even if they