merge default to 'openvms'openvms

changed:
.hgtags
c/_cffi_backend.c
c/ffi_obj.c
c/test_c.py
cffi/__init__.py
cffi/_embedding.h
cffi/recompiler.py
cffi/verifier.py
doc/source/conf.py
doc/source/installation.rst
doc/source/whatsnew.rst
setup.py
setup_base.py
testing/cffi0/test_ffi_backend.py
testing/cffi0/test_version.py
testing/cffi1/test_re_python.py

1 files changed, 5 insertions, 0 deletions

diff --git a/testing/cffi1/test_re_python.py b/testing/cffi1/test_re_python.py
index dce4f40..2ae0dd1 100644
--- a/testing/cffi1/test_re_python.py
+++ b/testing/cffi1/test_re_python.py
@@ -74,6 +74,7 @@ def setup_module(mod):
     int strlen(const char *);
     struct with_union { union { int a; char b; }; };
     union with_struct { struct { int a; char b; }; };
+    struct with_struct_with_union { struct { union { int x; }; } cp; };
     struct NVGcolor { union { float rgba[4]; struct { float r,g,b,a; }; }; };
     typedef struct selfref { struct selfref *next; } *selfref_ptr_t;
     """)
@@ -248,6 +249,10 @@ def test_anonymous_union_inside_struct():
     assert ffi.offsetof("union with_struct", "b") == INT
     assert ffi.sizeof("union with_struct") >= INT + 1
     #
+    assert ffi.sizeof("struct with_struct_with_union") == INT
+    p = ffi.new("struct with_struct_with_union *")
+    assert p.cp.x == 0
+    #
     FLOAT = ffi.sizeof("float")
     assert ffi.sizeof("struct NVGcolor") == FLOAT * 4
     assert ffi.offsetof("struct NVGcolor", "rgba") == 0