Commit 0e38f7215bede51b2ad3b8574e8b472c279d3db4 | zig

author	hryx <codroid@gmail.com> 2019-06-29 14:34:00-07:00
committer	hryx <codroid@gmail.com> 2019-06-29 14:34:00-07:00
log	0e38f7215bede51b2ad3b8574e8b472c279d3db4
tree	75c90f146e22bc44830826735036218340aff749
parent	247e567422a0efde2ed1f2cbf1b16f217f2b61d9
signature	Commit is signed but in an unrecognized format.

2 files changed, 9 insertions(+), 2 deletions(-)

src-self-hosted/clang.zig+3-1

...	@@ -1,3 +1,5 @@	...	@@ -1,3 +1,5 @@
		1	const builtin = @import("builtin");
		2
1	pub const struct_ZigClangAPSInt = @OpaqueType();	3	pub const struct_ZigClangAPSInt = @OpaqueType();
2	pub const struct_ZigClangAPFloat = @OpaqueType();	4	pub const struct_ZigClangAPFloat = @OpaqueType();
3	pub const struct_ZigClangASTContext = @OpaqueType();	5	pub const struct_ZigClangASTContext = @OpaqueType();
...	@@ -938,7 +940,7 @@ pub const struct_ZigClangExprEvalResult = extern struct {	...	@@ -938,7 +940,7 @@ pub const struct_ZigClangExprEvalResult = extern struct {
938		940
939	pub const struct_ZigClangAPValue = extern struct {	941	pub const struct_ZigClangAPValue = extern struct {
940	Kind: ZigClangAPValue_ValueKind,	942	Kind: ZigClangAPValue_ValueKind,
941	Data: [68]u8, // TODO: is there a way to statically assert that this matches the .h?	943	Data: if (builtin.os == .windows) [52]u8 else [68]u8,
942	};	944	};
943		945
944	pub const ZigClangAPValue_ValueKind = extern enum {	946	pub const ZigClangAPValue_ValueKind = extern enum {

src/zig_clang.h+6-1

 @@ -47,7 +47,12 @@ enum ZigClangAPValue_ValueKind {
 struct ZigClangAPValue {
     enum ZigClangAPValue_ValueKind Kind;
-    char Data[68]; // experimentally-derived size of clang::APValue::DataType
+    // experimentally-derived size of clang::APValue::DataType
+#ifdef _WIN32
+    char Data[52];
+#else
+    char Data[68];
+#endif
 };
 struct ZigClangExprEvalResult {