summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Scilab2C/Scilab2C/CCodeGeneration/C_Funcall.sci12
-rw-r--r--src/Scilab2C/Scilab2C/CCodeGeneration/C_GenDeclarations.sci2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/Scilab2C/Scilab2C/CCodeGeneration/C_Funcall.sci b/src/Scilab2C/Scilab2C/CCodeGeneration/C_Funcall.sci
index 643b3d43..fcda4ebb 100644
--- a/src/Scilab2C/Scilab2C/CCodeGeneration/C_Funcall.sci
+++ b/src/Scilab2C/Scilab2C/CCodeGeneration/C_Funcall.sci
@@ -105,14 +105,14 @@ for counterin = 1:NInArg
if (InArg(counterin).Dimension == 0)
if (FlagCall == 0)
- CCall = CCall+TmpInArgType+' ';
+ CCall = CCall+' ';
end
CCall = CCall+TmpInArgName+',';
else
if (FlagCall == 0)
- CCall = CCall+TmpInArgType+'* '+TmpInArgName+', SCI2Cint* __'+TmpInArgName+'Size,';
+ CCall = CCall+TmpInArgName+', SCI2Cint* __'+TmpInArgName+'Size,';
else
- CCall = CCall+'('+TmpInArgType+'* )'+TmpInArgName+', '+TmpInArgSizeVar+',';
+ CCall = CCall+TmpInArgName+', '+TmpInArgSizeVar+',';
end
end
end
@@ -123,7 +123,7 @@ for counterout = 1:NOutArg
if (counterout == PosFirstOutScalar)
if (FlagCall == 0)
// --- Write in the declaration file the returned output scalar (if any). ---
- outscalardeclaration = TmpOutArgType+' '+TmpOutArgName+';';
+ outscalardeclaration = TmpOutArgName+';';
PrintStringInfo(C_IndentBlanks(1)+outscalardeclaration,CDeclarationFileName,'file','y');
PrintStringInfo(' ',CDeclarationFileName,'file','y');
end
@@ -140,7 +140,7 @@ for counterout = 1:NOutArg
end
else
if (FlagCall == 0)
- CCall = CCall+TmpOutArgType+'* '+TmpOutArgName+',';
+ CCall = CCall+TmpOutArgName+',';
if (OutArg(counterout).FindLike == 1)
CCall = CCall+'SCI2Cint* __'+TmpOutArgName+'Size'+',';
end
@@ -152,7 +152,7 @@ for counterout = 1:NOutArg
PrintStringInfo(C_IndentBlanks(1)+outscalardeclaration,CInitVarsFileName,'file','y');
PrintStringInfo(' ',CInitVarsFileName,'file','y');
else
- CCall = CCall+'('+TmpOutArgType+'* )'+OutArg(counterout).Name+',';
+ CCall = CCall+OutArg(counterout).Name+',';
if (OutArg(counterout).FindLike == 1)
CCall = CCall+'(SCI2Cint* ) __'+TmpOutArgName+'Size'+',';
end
diff --git a/src/Scilab2C/Scilab2C/CCodeGeneration/C_GenDeclarations.sci b/src/Scilab2C/Scilab2C/CCodeGeneration/C_GenDeclarations.sci
index 0848f33f..5caa8d7c 100644
--- a/src/Scilab2C/Scilab2C/CCodeGeneration/C_GenDeclarations.sci
+++ b/src/Scilab2C/Scilab2C/CCodeGeneration/C_GenDeclarations.sci
@@ -48,7 +48,7 @@ if (ArgStruct.Dimension > 0)
else
// Declare the array with its size.
Cdeclaration(1) = Cdeclaration(1)+C_Type(ArgStruct.Type)+...
- ' '+ArgStruct.Name+'['+ArgStruct.Size(1)+']['+ArgStruct.Size(2)+'];';
+ ' '+ArgStruct.Name+'['+ArgStruct.Size(1)+'*'+ArgStruct.Size(2)+'];';
Cdeclaration(2) = Cdeclaration(2)+C_Type('i')+' __'+ArgStruct.Name+'Size[2] = {'+ArgStruct.Size(1)+','+ArgStruct.Size(2)+'};';
NDeclarations = 2;
end