# HG changeset patch
# User lbessard
# Date 1207673059 -7200
# Node ID 3db23eda0e83ce87de5e96e4a36c11e60e44f00f
# Parent  e0072be41a0444896a7b992e593ce202b9fba935
Clash with iec_std_lib.h and windows.h bug fixed

diff -r e0072be41a04 -r 3db23eda0e83 plugins/svgui/svgui.py
--- a/plugins/svgui/svgui.py	Fri Apr 04 17:54:05 2008 +0200
+++ b/plugins/svgui/svgui.py	Tue Apr 08 18:44:19 2008 +0200
@@ -208,7 +208,7 @@
         return text
     
     def GenerateGlobalVarsAndFuncs(self, elements, size):
-        text = "#include \"iec_std_lib.h\"\n\n"
+        text = "#include \"iec_types.h\"\n\n"
         
         text += self.GenerateIECVars(elements)
         
@@ -293,7 +293,7 @@
 
 IEC_STRING wxStringToIEC_STRING(wxString s)
 {
-  STRING res = {0,""};
+  IEC_STRING res = {0,""};
   int i;
   for(i = 0; i<s.Length() && i<STR_MAX_LEN; i++)
     res.body[i] = s.GetChar(i);