Jacek Caban : msvcrt/tests: Don't define structs types inside other struct declaration.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2e02cee9c43c9a2e44547a926443ecf0e7bf88bb
URL:    https://gitlab.winehq.org/wine/wine/-/commit/2e02cee9c43c9a2e44547a926443ecf...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Wed Nov  8 19:45:56 2023 +0100

msvcrt/tests: Don't define structs types inside other struct declaration.

Fixes -Wincompatible-pointer-types clang warnings.

---

 dlls/msvcrt/tests/cpp.c | 49 ++++++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c
index e5fa652ede2..2dec315ba68 100644
--- a/dlls/msvcrt/tests/cpp.c
+++ b/dlls/msvcrt/tests/cpp.c
@@ -891,33 +891,36 @@ static void test_rtti(void)
       DEFINE_RTTI_REF(void, object_locator);
   } *obj_locator;
 
+  struct _rtti_base_descriptor
+  {
+    DEFINE_RTTI_REF(type_info, type_descriptor);
+    int num_base_classes;
+    struct {
+      int this_offset;
+      int vbase_descr;
+      int vbase_offset;
+    } this_ptr_offsets;
+    unsigned int attributes;
+  };
+
+  struct _rtti_base_array {
+    DEFINE_RTTI_REF(struct _rtti_base_descriptor, bases[4]);
+  };
+
+  struct _rtti_object_hierarchy {
+    unsigned int signature;
+    unsigned int attributes;
+    int array_len;
+    DEFINE_RTTI_REF(struct _rtti_base_array, base_classes);
+  };
+
   struct rtti_data
   {
     type_info type_info[4];
 
-    struct _rtti_base_descriptor
-    {
-      DEFINE_RTTI_REF(type_info, type_descriptor);
-      int num_base_classes;
-      struct {
-        int this_offset;
-        int vbase_descr;
-        int vbase_offset;
-      } this_ptr_offsets;
-      unsigned int attributes;
-    } base_descriptor[4];
-
-    struct _rtti_base_array {
-      DEFINE_RTTI_REF(struct _rtti_base_descriptor, bases[4]);
-    } base_array;
-
-    struct _rtti_object_hierarchy {
-      unsigned int signature;
-      unsigned int attributes;
-      int array_len;
-      DEFINE_RTTI_REF(struct _rtti_base_array, base_classes);
-    } object_hierarchy;
-
+    struct _rtti_base_descriptor base_descriptor[4];
+    struct _rtti_base_array base_array;
+    struct _rtti_object_hierarchy  object_hierarchy;
     struct _object_locator object_locator;
   } simple_class_rtti = {
     { {NULL, NULL, "simple_class"} },