diff --git a/Lib/scilab/scimatrixbool.swg b/Lib/scilab/scimatrixbool.swg
index 97c9e8f74..749a97424 100644
--- a/Lib/scilab/scimatrixbool.swg
+++ b/Lib/scilab/scimatrixbool.swg
@@ -5,9 +5,9 @@
 
 %include <scibool.swg>
 
-// in (bool* matrixIn, int matrixInRowCount, int matrixInColCount)
+// in (bool *matrixIn, int matrixInRowCount, int matrixInColCount)
 
-%typemap(in, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (bool* matrixIn, int matrixInRowCount, int matrixInColCount)
+%typemap(in, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (bool *matrixIn, int matrixInRowCount, int matrixInColCount)
 {
   if (SWIG_SciBoolean_AsBoolArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK)
   {
@@ -15,9 +15,9 @@
   }
 }
 
-// in (int matrixInRowCount, int matrixInColCount, bool* matrixIn)
+// in (int matrixInRowCount, int matrixInColCount, bool *matrixIn)
 
-%typemap(in, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (int matrixInRowCount, int matrixInColCount, bool* matrixIn)
+%typemap(in, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (int matrixInRowCount, int matrixInColCount, bool *matrixIn)
 {
   if (SWIG_SciBoolean_AsBoolArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK)
   {
@@ -25,9 +25,9 @@
   }
 }
 
-// in (bool* vectorIn, int vectorInSize)
+// in (bool *vectorIn, int vectorInSize)
 
-%typemap(in, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (bool* vectorIn, int vectorInSize)
+%typemap(in, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (bool *vectorIn, int vectorInSize)
 {
     int rowCount;
     int colCount;
@@ -41,9 +41,9 @@
     }
 }
 
-// in (int vectorInSize, bool* vectorIn)
+// in (int vectorInSize, bool *vectorIn)
 
-%typemap(in) (int vectorInSize, bool* vectorIn)
+%typemap(in) (int vectorInSize, bool *vectorIn)
 {
     int rowCount;
     int colCount;
@@ -57,20 +57,20 @@
     }
 }
 
-// out (bool** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+// out (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 
-%typemap(in, numinputs=0) (bool** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+%typemap(in, numinputs=0) (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 {
 }
 
-%typemap(arginit) (bool** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+%typemap(arginit) (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 {
   $1 = (bool**) malloc(sizeof(bool*));
   $2 = (int*) malloc(sizeof(int));
   $3 = (int*) malloc(sizeof(int));
 }
 
-%typemap(freearg) (bool** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+%typemap(freearg) (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 {
   free(*$1);
   free($1);
@@ -78,7 +78,7 @@
   free($3);
 }
 
-%typemap(argout, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (bool** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+%typemap(argout, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 {
   if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK)
   {
@@ -90,20 +90,20 @@
   }
 }
 
-// out (int* matrixOutRowCount, int* matrixOutColCount, bool** matrixOut)
+// out (int *matrixOutRowCount, int *matrixOutColCount, bool **matrixOut)
 
-%typemap(in, numinputs=0) (int* matrixOutRowCount, int* matrixOutColCount, bool** matrixOut)
+%typemap(in, numinputs=0) (int *matrixOutRowCount, int *matrixOutColCount, bool **matrixOut)
 {
 }
 
-%typemap(arginit) (int* matrixOutRowCount, int* matrixOutColCount, bool** matrixOut)
+%typemap(arginit) (int *matrixOutRowCount, int *matrixOutColCount, bool **matrixOut)
 {
   $1 = (int*) malloc(sizeof(int));
   $2 = (int*) malloc(sizeof(int));
   $3 = (bool**) malloc(sizeof(bool*));
 }
 
-%typemap(argout, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (int* matrixInRowCount, int* matrixInColCount, bool** matrixOut)
+%typemap(argout, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (int *matrixInRowCount, int *matrixInColCount, bool **matrixOut)
 {
   if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK)
   {
@@ -115,7 +115,7 @@
   }
 }
 
-%typemap(freearg) (int* matrixOutRowCount, int* matrixOutColCount, bool** matrixOut)
+%typemap(freearg) (int *matrixOutRowCount, int *matrixOutColCount, bool **matrixOut)
 {
   free($1);
   free($2);
@@ -124,19 +124,19 @@
 }
 
 
-// out (bool** vectorOut, int* vectorOutSize)
+// out (bool **vectorOut, int *vectorOutSize)
 
-%typemap(in, numinputs=0) (bool** vectorOut, int* vectorOutSize)
+%typemap(in, numinputs=0) (bool **vectorOut, int *vectorOutSize)
 {
 }
 
-%typemap(arginit) (bool** vectorOut, int* vectorOutSize)
+%typemap(arginit) (bool **vectorOut, int *vectorOutSize)
 {
   $1 = (bool**) malloc(sizeof(bool*));
   $2 = (int*) malloc(sizeof(int));
 }
 
-%typemap(argout, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (bool** vectorOut, int* vectorOutSize)
+%typemap(argout, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (bool **vectorOut, int *vectorOutSize)
 {
   if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK)
   {
@@ -148,7 +148,7 @@
   }
 }
 
-%typemap(freearg) (bool** vectorOut, int* vectorOutSize)
+%typemap(freearg) (bool **vectorOut, int *vectorOutSize)
 {
   free(*$1);
   free($1);
@@ -156,19 +156,19 @@
 }
 
 
-// out (int* vectorOutSize, bool** vectorOut)
+// out (int *vectorOutSize, bool **vectorOut)
 
-%typemap(in, numinputs=0) (int* vectorOutSize, bool** vectorOut)
+%typemap(in, numinputs=0) (int *vectorOutSize, bool **vectorOut)
 {
 }
 
-%typemap(arginit) (int* vectorOutSize, bool** vectorOut)
+%typemap(arginit) (int *vectorOutSize, bool **vectorOut)
 {
   $1 = (int*) malloc(sizeof(int));
   $2 = (bool**) malloc(sizeof(bool*));
 }
 
-%typemap(argout, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (int* vectorOutSize, bool** vectorOut)
+%typemap(argout, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (int *vectorOutSize, bool **vectorOut)
 {
   if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK)
   {
@@ -180,7 +180,7 @@
   }
 }
 
-%typemap(freearg) (int* vectorOutSize, bool** vectorOut)
+%typemap(freearg) (int *vectorOutSize, bool **vectorOut)
 {
   free($1);
   free(*$2);
diff --git a/Lib/scilab/scimatrixchar.swg b/Lib/scilab/scimatrixchar.swg
index 8ebca7b7a..029da1590 100644
--- a/Lib/scilab/scimatrixchar.swg
+++ b/Lib/scilab/scimatrixchar.swg
@@ -5,9 +5,9 @@
 
 %include <scichar.swg>
 
-// in (char** matrixIn, int matrixInRowCount, int matrixInColCount)
+// in (char **matrixIn, int matrixInRowCount, int matrixInColCount)
 
-%typemap(in, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (char** matrixIn, int matrixInRowCount, int matrixInColCount)
+%typemap(in, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (char **matrixIn, int matrixInRowCount, int matrixInColCount)
 {
   if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK)
   {
@@ -15,9 +15,9 @@
   }
 }
 
-// in (int matrixInRowCount, int matrixInColCount, char** matrixIn)
+// in (int matrixInRowCount, int matrixInColCount, char **matrixIn)
 
-%typemap(in, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (int matrixInRowCount, int matrixInColCount, char** matrixIn)
+%typemap(in, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (int matrixInRowCount, int matrixInColCount, char **matrixIn)
 {
   if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK)
   {
@@ -25,9 +25,9 @@
   }
 }
 
-// in (char** vectorIn, int vectorInSize)
+// in (char **vectorIn, int vectorInSize)
 
-%typemap(in, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (char** vectorIn, int vectorInSize)
+%typemap(in, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (char **vectorIn, int vectorInSize)
 {
   if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, 1, &$2, &$1, fname) != SWIG_OK)
   {
@@ -35,20 +35,20 @@
   }
 }
 
-// out (char*** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+// out (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 
-%typemap(in, numinputs=0) (char*** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+%typemap(in, numinputs=0) (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 {
 }
 
-%typemap(arginit) (char*** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+%typemap(arginit) (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 {
   $1 = (char***) malloc(sizeof(char**));
   $2 = (int*) malloc(sizeof(int));
   $3 = (int*) malloc(sizeof(int));
 }
 
-%typemap(argout, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (char*** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+%typemap(argout, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 {
   if (SWIG_SciString_FromCharPtrArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK)
   {
@@ -60,7 +60,7 @@
   }
 }
 
-%typemap(freearg) (char*** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+%typemap(freearg) (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 {
   free(*$1);
   free($1);
@@ -68,20 +68,20 @@
   free($3);
 }
 
-// out (int* matrixOutRowCount, int* matrixOutColCount, char*** matrixOut)
+// out (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut)
 
-%typemap(in, numinputs=0) (int* matrixOutRowCount, int* matrixOutColCount, char*** matrixOut)
+%typemap(in, numinputs=0) (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut)
 {
 }
 
-%typemap(arginit) (int* matrixOutRowCount, int* matrixOutColCount, char*** matrixOut)
+%typemap(arginit) (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut)
 {
   $1 = (char***) malloc(sizeof(char**));
   $2 = (int*) malloc(sizeof(int));
   $3 = (int**) malloc(sizeof(int*));
 }
 
-%typemap(argout, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (int* matrixOutRowCount, int* matrixOutColCount, char*** matrixOut)
+%typemap(argout, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut)
 {
   if (SWIG_SciString_FromCharPtrArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK)
   {
@@ -93,7 +93,7 @@
   }
 }
 
-%typemap(freearg) (int* matrixOutRowCount, int* matrixOutColCount, char*** matrixOut)
+%typemap(freearg) (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut)
 {
   free($1);
   free($2);
@@ -102,19 +102,19 @@
 }
 
 
-// out (char*** vectorOut, int* vectorOutSize)
+// out (char ***vectorOut, int *vectorOutSize)
 
-%typemap(in, numinputs=0) (char*** vectorOut, int* vectorOutSize)
+%typemap(in, numinputs=0) (char ***vectorOut, int *vectorOutSize)
 {
 }
 
-%typemap(arginit) (char*** vectorOut, int* vectorOutSize)
+%typemap(arginit) (char ***vectorOut, int *vectorOutSize)
 {
   $1 = (char***) malloc(sizeof(char**));
   $2 = (int*) malloc(sizeof(int));
 }
 
-%typemap(freearg) (char*** vectorOut, int* vectorOutSize)
+%typemap(freearg) (char ***vectorOut, int *vectorOutSize)
 {
   free(*(*$1));
   free(*$1);
@@ -122,7 +122,7 @@
   free($2);
 }
 
-%typemap(argout, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (char*** vectorOut, int* vectorOutSize)
+%typemap(argout, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (char ***vectorOut, int *vectorOutSize)
 {
   if (SWIG_SciString_FromCharPtrArray(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK)
   {
@@ -134,9 +134,9 @@
   }
 }
 
-// in (int vectorInSize, char** vectorIn)
+// in (int vectorInSize, char **vectorIn)
 
-%typemap(in, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (int vectorInSize, char** vectorIn)
+%typemap(in, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (int vectorInSize, char **vectorIn)
 {
   if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, 1, &$1, &$2, fname) != SWIG_OK)
   {
@@ -144,19 +144,19 @@
   }
 }
 
-// out (int* vectorOutSize, char*** vectorOut)
+// out (int *vectorOutSize, char ***vectorOut)
 
-%typemap(in, numinputs=0) (int* vectorOutSize, char*** vectorOut)
+%typemap(in, numinputs=0) (int *vectorOutSize, char ***vectorOut)
 {
 }
 
-%typemap(arginit) (int* vectorOutSize, char*** vectorOut)
+%typemap(arginit) (int *vectorOutSize, char ***vectorOut)
 {
   $1 = (int*) malloc(sizeof(int));
   $2 = (char***) malloc(sizeof(char**));
 }
 
-%typemap(argout, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (int* vectorOutSize, char*** vectorOut)
+%typemap(argout, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (int *vectorOutSize, char ***vectorOut)
 {
   if (SWIG_SciString_FromCharPtrArray(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK)
   {
@@ -168,7 +168,7 @@
   }
 }
 
-%typemap(freearg) (int* vectorOutSize, char*** vectorOut)
+%typemap(freearg) (int *vectorOutSize, char ***vectorOut)
 {
   free($1);
   free(*(*$2));
diff --git a/Lib/scilab/scimatrixdouble.swg b/Lib/scilab/scimatrixdouble.swg
index 6614737d2..9a6d369a5 100644
--- a/Lib/scilab/scimatrixdouble.swg
+++ b/Lib/scilab/scimatrixdouble.swg
@@ -5,9 +5,9 @@
 
 %include <scidouble.swg>
 
-// in (double* matrixIn, int matrixInRowCount, int matrixInColCount)
+// in (double *matrixIn, int matrixInRowCount, int matrixInColCount)
 
-%typemap(in, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (double* matrixIn, int matrixInRowCount, int matrixInColCount)
+%typemap(in, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (double *matrixIn, int matrixInRowCount, int matrixInColCount)
 {
   if (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK)
   {
@@ -15,9 +15,9 @@
   }
 }
 
-// in (int matrixInRowCount, int matrixInColCount, double* matrixIn)
+// in (int matrixInRowCount, int matrixInColCount, double *matrixIn)
 
-%typemap(in, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (int matrixInRowCount, int matrixInColCount, double* matrixIn)
+%typemap(in, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (int matrixInRowCount, int matrixInColCount, double *matrixIn)
 {
   if (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK)
   {
@@ -25,9 +25,9 @@
   }
 }
 
-// in (double* vectorIn, int vectorInSize)
+// in (double *vectorIn, int vectorInSize)
 
-%typemap(in, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (double* vectorIn, int vectorInSize)
+%typemap(in, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (double *vectorIn, int vectorInSize)
 {
     int rowCount;
     int colCount;
@@ -41,9 +41,9 @@
     }
 }
 
-// in (int vectorInSize, double* vectorIn)
+// in (int vectorInSize, double *vectorIn)
 
-%typemap(in, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (int vectorInSize, double* vectorIn)
+%typemap(in, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (int vectorInSize, double *vectorIn)
 {
     int rowCount;
     int colCount;
@@ -57,20 +57,20 @@
     }
 }
 
-// out (double** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+// out (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 
-%typemap(in, numinputs=0) (double** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+%typemap(in, numinputs=0) (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 {
 }
 
-%typemap(arginit) (double** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+%typemap(arginit) (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 {
   $1 = (double**) malloc(sizeof(double*));
   $2 = (int*) malloc(sizeof(int));
   $3 = (int*) malloc(sizeof(int));
 }
 
-%typemap(freearg) (double** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+%typemap(freearg) (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 {
   free(*$1);
   free($1);
@@ -78,7 +78,7 @@
   free($3);
 }
 
-%typemap(argout, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (double** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+%typemap(argout, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 {
   if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK)
   {
@@ -90,20 +90,20 @@
   }
 }
 
-// out (int* matrixOutRowCount, int* matrixOutColCount, double** matrixOut)
+// out (int *matrixOutRowCount, int *matrixOutColCount, double **matrixOut)
 
-%typemap(in, numinputs=0) (int* matrixOutRowCount, int* matrixOutColCount, double** matrixOut)
+%typemap(in, numinputs=0) (int *matrixOutRowCount, int *matrixOutColCount, double **matrixOut)
 {
 }
 
-%typemap(arginit) (int* matrixOutRowCount, int* matrixOutColCount, double** matrixOut)
+%typemap(arginit) (int *matrixOutRowCount, int *matrixOutColCount, double **matrixOut)
 {
   $1 = (int*) malloc(sizeof(int));
   $2 = (int*) malloc(sizeof(int));
   $3 = (double**) malloc(sizeof(double*));
 }
 
-%typemap(argout, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (int* matrixInRowCount, int* matrixInColCount, double** matrixOut)
+%typemap(argout, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (int *matrixInRowCount, int *matrixInColCount, double **matrixOut)
 {
   if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK)
   {
@@ -115,7 +115,7 @@
   }
 }
 
-%typemap(freearg) (int* matrixOutRowCount, int* matrixOutColCount, double** matrixOut)
+%typemap(freearg) (int *matrixOutRowCount, int *matrixOutColCount, double **matrixOut)
 {
   free($1);
   free($2);
@@ -124,19 +124,19 @@
 }
 
 
-// out (double** vectorOut, int* vectorOutSize)
+// out (double **vectorOut, int *vectorOutSize)
 
-%typemap(in, numinputs=0) (double** vectorOut, int* vectorOutSize)
+%typemap(in, numinputs=0) (double **vectorOut, int *vectorOutSize)
 {
 }
 
-%typemap(arginit) (double** vectorOut, int* vectorOutSize)
+%typemap(arginit) (double **vectorOut, int *vectorOutSize)
 {
   $1 = (double**) malloc(sizeof(double*));
   $2 = (int*) malloc(sizeof(int));
 }
 
-%typemap(argout, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (double** vectorOut, int* vectorOutSize)
+%typemap(argout, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (double **vectorOut, int *vectorOutSize)
 {
   if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK)
   {
@@ -148,7 +148,7 @@
   }
 }
 
-%typemap(freearg) (double** vectorOut, int* vectorOutSize)
+%typemap(freearg) (double **vectorOut, int *vectorOutSize)
 {
   free(*$1);
   free($1);
@@ -156,19 +156,19 @@
 }
 
 
-// out (int* vectorOutSize, double** vectorOut)
+// out (int *vectorOutSize, double **vectorOut)
 
-%typemap(in, numinputs=0) (int* vectorOutSize, double** vectorOut)
+%typemap(in, numinputs=0) (int *vectorOutSize, double **vectorOut)
 {
 }
 
-%typemap(arginit) (int* vectorOutSize, double** vectorOut)
+%typemap(arginit) (int *vectorOutSize, double **vectorOut)
 {
   $1 = (int*) malloc(sizeof(int));
   $2 = (double**) malloc(sizeof(double*));
 }
 
-%typemap(argout, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (int* vectorOutSize, double** vectorOut)
+%typemap(argout, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (int *vectorOutSize, double **vectorOut)
 {
   if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK)
   {
@@ -180,7 +180,7 @@
   }
 }
 
-%typemap(freearg) (int* vectorOutSize, double** vectorOut)
+%typemap(freearg) (int *vectorOutSize, double **vectorOut)
 {
   free($1);
   free(*$2);
diff --git a/Lib/scilab/scimatrixint.swg b/Lib/scilab/scimatrixint.swg
index cda321ad7..70b2c9187 100644
--- a/Lib/scilab/scimatrixint.swg
+++ b/Lib/scilab/scimatrixint.swg
@@ -5,9 +5,9 @@
 
 %include <sciint.swg>
 
-// in (int* matrixIn, int matrixInRowCount, int matrixInColCount)
+// in (int *matrixIn, int matrixInRowCount, int matrixInColCount)
 
-%typemap(in, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int* matrixIn, int matrixInRowCount, int matrixInColCount)
+%typemap(in, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int *matrixIn, int matrixInRowCount, int matrixInColCount)
 {
   if (SWIG_SciDoubleOrInt32_AsIntArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK)
   {
@@ -16,9 +16,9 @@
 }
 
 
-// in (int matrixInRowCount, int matrixInColCount, int* matrixIn)
+// in (int matrixInRowCount, int matrixInColCount, int *matrixIn)
 
-%typemap(in, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int matrixInRowCount, int matrixInColCount, int* matrixIn)
+%typemap(in, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int matrixInRowCount, int matrixInColCount, int *matrixIn)
 {
   if (SWIG_SciDoubleOrInt32_AsIntArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK)
   {
@@ -27,9 +27,9 @@
 }
 
 
-// in (int* vectorIn, int vectorInSize)
+// in (int *vectorIn, int vectorInSize)
 
-%typemap(in, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int* vectorIn, int vectorInSize)
+%typemap(in, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int *vectorIn, int vectorInSize)
 {
     int rowCount;
     int colCount;
@@ -44,9 +44,9 @@
 }
 
 
-// in (int vectorInSize, int* vectorIn)
+// in (int vectorInSize, int *vectorIn)
 
-%typemap(in, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int vectorInSize, int* vectorIn)
+%typemap(in, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int vectorInSize, int *vectorIn)
 {
     int rowCount;
     int colCount;
@@ -60,20 +60,20 @@
     }
 }
 
-// out (int** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+// out (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 
-%typemap(in, numinputs=0) (int** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+%typemap(in, numinputs=0) (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 {
 }
 
-%typemap(arginit) (int** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+%typemap(arginit) (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 {
   $1 = (int**) malloc(sizeof(int*));
   $2 = (int*) malloc(sizeof(int));
   $3 = (int*) malloc(sizeof(int));
 }
 
-%typemap(argout, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+%typemap(argout, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 {
   if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK)
   {
@@ -85,7 +85,7 @@
   }
 }
 
-%typemap(freearg) (int** matrixOut, int* matrixOutRowCount, int* matrixOutColCount)
+%typemap(freearg) (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount)
 {
   free(*$1);
   free($1);
@@ -94,20 +94,20 @@
 }
 
 
-// out (int* matrixOutRowCount, int* matrixOutColCount, int** matrixOut)
+// out (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut)
 
-%typemap(in, numinputs=0) (int* matrixOutRowCount, int* matrixOutColCount, int** matrixOut)
+%typemap(in, numinputs=0) (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut)
 {
 }
 
-%typemap(arginit) (int* matrixOutRowCount, int* matrixOutColCount, int** matrixOut)
+%typemap(arginit) (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut)
 {
   $1 = (int*) malloc(sizeof(int));
   $2 = (int*) malloc(sizeof(int));
   $3 = (int**) malloc(sizeof(int*));
 }
 
-%typemap(argout, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int* matrixOutRowCount, int* matrixOutColCount, int** matrixOut)
+%typemap(argout, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut)
 {
   if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK)
   {
@@ -119,7 +119,7 @@
   }
 }
 
-%typemap(freearg) (int* matrixOutRowCount, int* matrixOutColCount, int** matrixOut)
+%typemap(freearg) (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut)
 {
   free($1);
   free($2);
@@ -128,19 +128,19 @@
 }
 
 
-// out (int** vectorOut, int* vectorOutSize)
+// out (int **vectorOut, int *vectorOutSize)
 
-%typemap(in, numinputs=0) (int** vectorOut, int* vectorOutSize)
+%typemap(in, numinputs=0) (int **vectorOut, int *vectorOutSize)
 {
 }
 
-%typemap(arginit) (int** vectorOut, int* vectorOutSize)
+%typemap(arginit) (int **vectorOut, int *vectorOutSize)
 {
   $1 = (int**) malloc(sizeof(int*));
   $2 = (int*) malloc(sizeof(int));
 }
 
-%typemap(argout, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int** vectorOut, int* vectorOutSize)
+%typemap(argout, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int **vectorOut, int *vectorOutSize)
 {
   if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK)
   {
@@ -152,7 +152,7 @@
   }
 }
 
-%typemap(freearg) (int** vectorOut, int* vectorOutSize)
+%typemap(freearg) (int **vectorOut, int *vectorOutSize)
 {
   free(*$1);
   free($1);
@@ -160,19 +160,19 @@
 }
 
 
-// out (int* vectorOutSize, int** vectorOut)
+// out (int *vectorOutSize, int **vectorOut)
 
-%typemap(in, numinputs=0) (int* vectorOutSize, int** vectorOut)
+%typemap(in, numinputs=0) (int *vectorOutSize, int **vectorOut)
 {
 }
 
-%typemap(arginit) (int* vectorOutSize, int** vectorOut)
+%typemap(arginit) (int *vectorOutSize, int **vectorOut)
 {
   $1 = (int*) malloc(sizeof(int));
   $2 = (int**) malloc(sizeof(int*));
 }
 
-%typemap(argout, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int* vectorOutSize, int** vectorOut)
+%typemap(argout, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int *vectorOutSize, int **vectorOut)
 {
   if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK)
   {
@@ -184,7 +184,7 @@
   }
 }
 
-%typemap(freearg) (int* vectorInSize, int** vectorOut)
+%typemap(freearg) (int *vectorInSize, int **vectorOut)
 {
   free($1);
   free(*$2);