[4/6] widl: Don't call write_embedded_types if an array element is a string.

Dmitry Timoshkov dmitry at baikal.ru
Wed Apr 2 04:37:41 CDT 2014


write_array_element_type() already generates complete element description
in that case.
---
 tools/widl/typegen.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c
index 37222d1..9d9aeb7 100644
--- a/tools/widl/typegen.c
+++ b/tools/widl/typegen.c
@@ -2899,7 +2899,8 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t
     if (!pointer_type)
         pointer_type = RPC_FC_RP;
 
-    write_embedded_types(file, attrs, type_array_get_element(type), name, FALSE, typestring_offset);
+    if (!is_string_type(attrs, type_array_get_element(type)))
+        write_embedded_types(file, attrs, type_array_get_element(type), name, FALSE, typestring_offset);
 
     size = type_memsize(is_conformant_array(type) ? type_array_get_element(type) : type);
     align = type_buffer_alignment(is_conformant_array(type) ? type_array_get_element(type) : type);
-- 
1.9.1




More information about the wine-patches mailing list