6 files changed, 8 insertions, 8 deletions
diff --git a/macros/CCodeGeneration/C_Funcall.sci b/macros/CCodeGeneration/C_Funcall.sci
index 456fe1e4..65aad5e2 100644
--- a/macros/CCodeGeneration/C_Funcall.sci
+++ b/macros/CCodeGeneration/C_Funcall.sci
@@ -176,7 +176,7 @@ end
 CCall ='';
 if (FunInfo.CFunctionName == SharedInfo.CMainFunName)
    if (FlagCall == 1)
-      SCI2Cerror('main function called in a source code!');
+      error(9999, 'main function called in a source code!');
    else
       CCall =CCall+'SCI2Cint ';
    end
diff --git a/macros/CCodeGeneration/C_IfElseBlocks.sci b/macros/CCodeGeneration/C_IfElseBlocks.sci
index 71b45966..92ac94f7 100644
--- a/macros/CCodeGeneration/C_IfElseBlocks.sci
+++ b/macros/CCodeGeneration/C_IfElseBlocks.sci
@@ -57,7 +57,7 @@ elseif (InOutStatements=='out')
    PrintStringInfo('   '+CCall,ReportFileName,'file','y');
    PrintStringInfo(C_IndentBlanks(IndentLevel)+CCall,CPass1FileName,'file','y');
 else
-   SCI2CerrorFile('Unknown setting for InOutStatements: '+InOutStatements'.',ReportFileName);
+   error(9999, 'Unknown setting for InOutStatements: '+InOutStatements+'.');
 end
 
 // #RNU_RES_B
diff --git a/macros/CCodeGeneration/C_IfExpression.sci b/macros/CCodeGeneration/C_IfExpression.sci
index 772f24ff..48a05383 100644
--- a/macros/CCodeGeneration/C_IfExpression.sci
+++ b/macros/CCodeGeneration/C_IfExpression.sci
@@ -23,7 +23,7 @@ SCI2CNInArgCheck(argn(2),5,5);
 
 // --- Check NIfCondArg value. ---
 if ((NIfCondArg ~= 1) & (ASTIfExpType~='else'))
-   SCI2CerrorFile('Cannot manage ""if/elseif"" with a number of condition variables not equal to 1.',ReportFileName);
+   error(9999, 'Cannot manage ""if/elseif"" with a number of condition variables not equal to 1.');
 end
 
 // -----------------------
@@ -53,7 +53,7 @@ elseif (ASTIfExpType=='elseif')
 elseif (ASTIfExpType=='else')
    CFunName = 'else';
 else
-   SCI2CerrorFile('Unknown ASTIfExpType ""'+ASTIfExpType+'"".',ReportFileName);
+   error(9999, 'Unknown ASTIfExpType ""'+ASTIfExpType+'"".');
 end
 
 // ----------------------------
diff --git a/macros/CCodeGeneration/C_Type.sci b/macros/CCodeGeneration/C_Type.sci
index f49dd9b1..5fc94f98 100644
--- a/macros/CCodeGeneration/C_Type.sci
+++ b/macros/CCodeGeneration/C_Type.sci
@@ -36,6 +36,6 @@ elseif (ArgType == 'g')
 elseif (ArgType == 'f')
    OutC_Type = 'SCI2CFILEID';
 else
-   SCI2Cerror('Unknown Argument Type: ""'+ArgType+'"".');
+   error(9999, 'Unknown Argument Type: ""'+ArgType+'"".');
 end
 endfunction
diff --git a/macros/CCodeGeneration/GetClsFileName.sci b/macros/CCodeGeneration/GetClsFileName.sci
index ec9ce5b9..46f08201 100644
--- a/macros/CCodeGeneration/GetClsFileName.sci
+++ b/macros/CCodeGeneration/GetClsFileName.sci
@@ -84,7 +84,7 @@ if (FlagFoundAnnFile == 0)
       PrintStringInfo('SCI2CERROR: an associated .sci or .ann file for function: '+FunName,ReportFileName,'both','y');
       PrintStringInfo(' ',ReportFileName,'both','y');
       // #RNU_RES_E
-      SCI2Cerror(' ');
+      error(9999, 'SCI2CERROR: Missing function annotation. Could not find an associated .sci or .ann file for function: '+FunName);
    end
    AnnFileName        = fullfile(FileInfo.USER2CLibSCIAnnFun,tmpannfilename);
    SCI2CClassName     = FunName;
diff --git a/macros/CCodeGeneration/GetSymbolDimension.sci b/macros/CCodeGeneration/GetSymbolDimension.sci
index bb6045a2..5828e0ae 100644
--- a/macros/CCodeGeneration/GetSymbolDimension.sci
+++ b/macros/CCodeGeneration/GetSymbolDimension.sci
@@ -30,7 +30,7 @@ function symboldimension = GetSymbolDimension(Field_Size)
 // Size is expressed as an array of two strings.
   Nelem = max(size(Field_Size));
   if (Nelem < 2)
-    SCI2Cerror('The size of a symbol cannot be expressed with one or zero numbers.');
+    error(9999, 'The size of a symbol cannot be expressed with one or zero numbers.');
   end
 
   for countersize = 1:Nelem
@@ -45,7 +45,7 @@ function symboldimension = GetSymbolDimension(Field_Size)
     if (isnum(Field_Size(countersize)))
       tmpnum = eval(Field_Size(countersize));
       if (tmpnum == 0)
-        SCI2Cerror('Found a symbol that has zeros elements. 0xN or Nx0 matrices are not allowed.');
+        error(9999, 'Found a symbol that has zeros elements. 0xN or Nx0 matrices are not allowed.');
       elseif (tmpnum == 1)
         Field_Type(countersize) = 0;
       else