Update functions name

4 files changed, 28 insertions, 3 deletions

diff --git a/macros/CCodeGeneration/C_Funcall.sci b/macros/CCodeGeneration/C_Funcall.sci
index 339c8451..8b629cb1 100644
--- a/macros/CCodeGeneration/C_Funcall.sci
+++ b/macros/CCodeGeneration/C_Funcall.sci
@@ -195,7 +195,12 @@ else
 end
 
 
-CCall = CCall+CFunName+'(';
+if CFunName == "main"
+  CCall = CCall + CFunName + "(";
+else
+  CCall = CCall+"SCI2C("+CFunName+")(";
+end
+
 // #RNU_RES_B
 PrintStringInfo('   C call after output scalar args check: '+CCall,ReportFileName,'file','y');
 // #RNU_RES_E
diff --git a/macros/CCodeGeneration/C_GenerateFunName.sci b/macros/CCodeGeneration/C_GenerateFunName.sci
index b5b8c12d..9d40d2b9 100644
--- a/macros/CCodeGeneration/C_GenerateFunName.sci
+++ b/macros/CCodeGeneration/C_GenerateFunName.sci
@@ -41,5 +41,4 @@ for tmpcnt = 1:NOutArg
       CFunName = CFunName+OutArg(tmpcnt).Type+SCI2Cstring(OutArg(tmpcnt).Dimension);
    end
 end
-
 endfunction
diff --git a/macros/CCodeGeneration/C_GenerateSCI2CHeader.sci b/macros/CCodeGeneration/C_GenerateSCI2CHeader.sci
new file mode 100644
index 00000000..bced7243
--- /dev/null
+++ b/macros/CCodeGeneration/C_GenerateSCI2CHeader.sci
@@ -0,0 +1,21 @@
+//
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010-2010 - DIGITEO - Bruno JOFRET
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+//
+//
+function C_GenerateSCI2CHeader(OutputPath, FunctionPrefix)
+  FileName = OutputPath+"scilab2c.h"
+  C_SCI2CHeader(FileName);
+  PrintStringInfo('#ifndef __SCILAB2C_H__',FileName,'file','y');
+  PrintStringInfo('#define __SCILAB2C_H__',FileName,'file','y');
+  PrintStringInfo('',FileName,'file','y');
+  PrintStringInfo('#define SCI2C(Name) '+FunctionPrefix+'_##Name',FileName,'file','y');
+  PrintStringInfo('',FileName,'file','y');
+  PrintStringInfo('#endif /* !__SCILAB2C_H__ */',FileName,'file','y');
+endfunction
diff --git a/macros/sci2c_gui.sci b/macros/sci2c_gui.sci
index aaae2ac2..e4dfb19e 100644
--- a/macros/sci2c_gui.sci
+++ b/macros/sci2c_gui.sci
@@ -130,7 +130,7 @@ buildtoolradiounix = uicontrol("parent", sci2cfig,...
     "max", 1, ...
     "callback", "cb_sci2c_gui",...
     "tag", "buildtoolradiounix");
-if MSDOS
+if getos() == "Windows"
   set(buildtoolradiowin, "value", 1);
   set(buildtoolradiounix, "value", 0);
 else