From 277c6721480be163d8e7e4944acfe9c7c1d5278f Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@ucc.asn.au>
Date: Mon, 19 Feb 2018 08:40:07 +0800
Subject: Codegen C - Fix bad attempt at making MSVC work

---
 src/trans/codegen_c.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/trans/codegen_c.cpp b/src/trans/codegen_c.cpp
index 53448ad9..b8770c30 100644
--- a/src/trans/codegen_c.cpp
+++ b/src/trans/codegen_c.cpp
@@ -896,9 +896,9 @@ namespace {
                     has_unsized = true;
                 }
                 else {
-                    size_t s;
-                    Target_GetSizeOf(sp, m_resolve, ty, s);
-                    if( s == 0 ) {
+                    size_t s, a;
+                    Target_GetSizeAndAlignOf(sp, m_resolve, ty, s, a);
+                    if( s == 0 && m_options.disallow_empty_structs ) {
                         m_of << "// ZST\n";
                         continue ;
                     }
@@ -910,12 +910,9 @@ namespace {
                 }
                 m_of << ";\n";
             }
-            if( sized_fields == 0 )
+            if( sized_fields == 0 &&  m_options.disallow_empty_structs )
             {
-                if( m_options.disallow_empty_structs )
-                {
-                    m_of << "\tchar _d;\n";
-                }
+                m_of << "\tchar _d;\n";
             }
             m_of << "}";
             if(is_packed)
-- 
cgit v1.2.3