Merge commit 'bff9936c' into refcounting

498208da · Marius Wachtler · 1ea38436 · bff9936c · 498208da
Commit 498208da authored Mar 21, 2016 by Marius Wachtler
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

from_cpython/Modules/_ctypes/ctypes.h from_cpython/Modules/_ctypes/ctypes.h +2 -1

No files found.
--- a/from_cpython/Modules/_ctypes/ctypes.h
+++ b/from_cpython/Modules/_ctypes/ctypes.h
@@ -343,7 +343,8 @@ struct tagPyCArgObject {
 #ifdef HAVE_LONG_LONG
        PY_LONG_LONG q;
 #endif
-        long double D;
+        // Pyston change: disable this 16byte type because our allocator doesn't align allocs to 16byte.
+        // long double D;
        double d;
        float f;
        void *p;