fix

vlang · Sep 30, 2024 · 3ee57d0 · 3ee57d0
1 parent d66e924
commit 3ee57d0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
@@ -7353,8 +7353,7 @@ fn (mut g Gen) type_default(typ_ ast.Type) string {
 				'{'
 			}
 			$if windows {
-				if g.pref.ccompiler_type == .tinyc && !typ.has_flag(.shared_f)
-					&& g.inside_global_decl {
+				if !typ.has_flag(.shared_f) && g.inside_global_decl {
 					init_str = '(${g.typ(typ)}){'
 				}
 			}

diff --git a/...c/testdata/global_initializer.c.must_have → ...stdata/global_initializer_nix.c.must_have b/...c/testdata/global_initializer.c.must_have → ...stdata/global_initializer_nix.c.must_have
diff --git a/vlib/v/gen/c/testdata/global_initializer.vv → .../gen/c/testdata/global_initializer_nix.vv b/vlib/v/gen/c/testdata/global_initializer.vv → .../gen/c/testdata/global_initializer_nix.vv
diff --git a/vlib/v/gen/c/testdata/global_initializer_windows.must_have b/vlib/v/gen/c/testdata/global_initializer_windows.must_have
@@ -0,0 +1 @@
+Array_fixed_main__Foo_3  g_test_foo = {(main__Foo){.foo = 0,.bar = (main___VAnonStruct1){.a = 0,.b = 0,},}, (main__Foo){.foo = 0,.bar = (main___VAnonStruct1){.a = 0,.b = 0,},}, (main__Foo){.foo = 0,.bar = (main___VAnonStruct1){.a = 0,.b = 0,},}}; // global4
diff --git a/vlib/v/gen/c/testdata/global_initializer_windows.vv b/vlib/v/gen/c/testdata/global_initializer_windows.vv
@@ -0,0 +1,11 @@
+// vtest vflags: -enable-globals
+
+struct Foo {
+	foo int
+	bar struct {
+		a int
+		b f64
+	}
+}
+
+__global g_test_foo = [3]Foo{}