Use scicos_block4 typedef and avoid long use instead of int.

Change-Id: I7b7a869a24b15dc246f3feb10d275dab5c956efd

diff --git a/scilab/modules/scicos_blocks/src/c/extract_bit_32_LH.c b/scilab/modules/scicos_blocks/src/c/extract_bit_32_LH.c
index 52108c8..cec7520 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/extract_bit_32_LH.c
+++ b/scilab/modules/scicos_blocks/src/c/extract_bit_32_LH.c
@@ -26,14 +26,14 @@
 SCICOS_BLOCKS_IMPEXP void extract_bit_32_LH(scicos_block *block, int flag)
 {
     int i = 0, maxim = 0;
-    long *y = NULL, *u = NULL, ref = 0, n = 0;
+    SCSINT32_COP *y = NULL, *u = NULL, ref = 0, n = 0;
     y = Getint32OutPortPtrs(block, 1);
     u = Getint32InPortPtrs(block, 1);
     maxim = 32;
     ref = 0;
     for (i = 0; i < maxim / 2; i++)
     {
-        n = (long)pow(2, i);
+        n = (SCSINT32_COP)pow(2, i);
         ref = ref + n;
     }
     *y = (*u) & (ref);

diff --git a/scilab/modules/scicos_blocks/src/c/extract_bit_32_LSB.c b/scilab/modules/scicos_blocks/src/c/extract_bit_32_LSB.c
index bf5a57e..dcb4822 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/extract_bit_32_LSB.c
+++ b/scilab/modules/scicos_blocks/src/c/extract_bit_32_LSB.c
@@ -27,7 +27,7 @@
 SCICOS_BLOCKS_IMPEXP void extract_bit_32_LSB(scicos_block *block, int flag)
 {
     int i = 0, maxim = 0;
-    long *y, *u, ref, n;
+    SCSINT32_COP *y, *u, ref, n;
     int *ipar;
     y = Getint32OutPortPtrs(block, 1);
     u = Getint32InPortPtrs(block, 1);
@@ -36,7 +36,7 @@ SCICOS_BLOCKS_IMPEXP void extract_bit_32_LSB(scicos_block *block, int flag)
     ref = 0;
     for (i = 0; i < *ipar; i++)
     {
-        n = (long)pow(2, i);
+        n = (SCSINT32_COP)pow(2, i);
         ref = ref + n;
     }
     *y = (*u) & (ref);

diff --git a/scilab/modules/scicos_blocks/src/c/extract_bit_32_MSB0.c b/scilab/modules/scicos_blocks/src/c/extract_bit_32_MSB0.c
index fc5de49..8f70675 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/extract_bit_32_MSB0.c
+++ b/scilab/modules/scicos_blocks/src/c/extract_bit_32_MSB0.c
@@ -27,7 +27,7 @@
 SCICOS_BLOCKS_IMPEXP void extract_bit_32_MSB0(scicos_block *block, int flag)
 {
     int i = 0, maxim = 0;
-    long *y = NULL, *u = NULL, ref = 0, n = 0;
+    SCSINT32_COP *y = NULL, *u = NULL, ref = 0, n = 0;
     int *ipar = NULL;
     y = Getint32OutPortPtrs(block, 1);
     u = Getint32InPortPtrs(block, 1);
@@ -36,9 +36,9 @@ SCICOS_BLOCKS_IMPEXP void extract_bit_32_MSB0(scicos_block *block, int flag)
     ref = 0;
     for (i = 0; i < *ipar; i++)
     {
-        n = (long)pow(2, maxim - 1 - i);
+        n = (SCSINT32_COP)pow(2, maxim - 1 - i);
         ref = ref + n;
     }
     *y = (*u) & (ref);
 }
-/*--------------------------------------------------------------------------*/
\ No newline at end of file
+/*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/scicos_blocks/src/c/extract_bit_32_MSB1.c b/scilab/modules/scicos_blocks/src/c/extract_bit_32_MSB1.c
index b333321..67cd634 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/extract_bit_32_MSB1.c
+++ b/scilab/modules/scicos_blocks/src/c/extract_bit_32_MSB1.c
@@ -27,7 +27,7 @@
 SCICOS_BLOCKS_IMPEXP void extract_bit_32_MSB1(scicos_block *block, int flag)
 {
     int i = 0, maxim = 0;
-    long *y = NULL, *u = NULL, ref = 0, n = 0;
+    SCSINT32_COP *y = NULL, *u = NULL, ref = 0, n = 0;
     int *ipar = NULL;
     y = Getint32OutPortPtrs(block, 1);
     u = Getint32InPortPtrs(block, 1);
@@ -36,7 +36,7 @@ SCICOS_BLOCKS_IMPEXP void extract_bit_32_MSB1(scicos_block *block, int flag)
     ref = 0;
     for (i = 0; i < *ipar; i++)
     {
-        n = (long)pow(2, maxim - 1 - i);
+        n = (SCSINT32_COP)pow(2, maxim - 1 - i);
         ref = ref + n;
     }
     *y = (*u) & (ref);

diff --git a/scilab/modules/scicos_blocks/src/c/extract_bit_32_RB0.c b/scilab/modules/scicos_blocks/src/c/extract_bit_32_RB0.c
index c758c74..5296207 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/extract_bit_32_RB0.c
+++ b/scilab/modules/scicos_blocks/src/c/extract_bit_32_RB0.c
@@ -27,7 +27,7 @@
 SCICOS_BLOCKS_IMPEXP void extract_bit_32_RB0(scicos_block *block, int flag)
 {
     int i = 0, maxim = 0, numb = 0;
-    long *y = NULL, *u = NULL, ref = 0, n = 0;
+    SCSINT32_COP *y = NULL, *u = NULL, ref = 0, n = 0;
     int *ipar = NULL;
     y = Getint32OutPortPtrs(block, 1);
     u = Getint32InPortPtrs(block, 1);
@@ -37,7 +37,7 @@ SCICOS_BLOCKS_IMPEXP void extract_bit_32_RB0(scicos_block *block, int flag)
     numb = *(ipar + 1) - *ipar + 1;
     for (i = 0; i < numb; i++)
     {
-        n = (long)pow(2, *ipar + i);
+        n = (SCSINT32_COP)pow(2, *ipar + i);
         ref = ref + n;
     }
     *y = (*u) & (ref);

diff --git a/scilab/modules/scicos_blocks/src/c/extract_bit_32_RB1.c b/scilab/modules/scicos_blocks/src/c/extract_bit_32_RB1.c
index ddb02a1..8fd7d88 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/extract_bit_32_RB1.c
+++ b/scilab/modules/scicos_blocks/src/c/extract_bit_32_RB1.c
@@ -27,7 +27,7 @@
 SCICOS_BLOCKS_IMPEXP void extract_bit_32_RB1(scicos_block *block, int flag)
 {
     int i = 0, maxim = 0, numb = 0;
-    long *y = NULL, *u = NULL, ref = 0, n = 0;
+    SCSINT32_COP *y = NULL, *u = NULL, ref = 0, n = 0;
     int *ipar = NULL;
     y = Getint32OutPortPtrs(block, 1);
     u = Getint32InPortPtrs(block, 1);
@@ -37,7 +37,7 @@ SCICOS_BLOCKS_IMPEXP void extract_bit_32_RB1(scicos_block *block, int flag)
     numb = *(ipar + 1) - *ipar + 1;
     for (i = 0; i < numb; i++)
     {
-        n = (long)pow(2, *ipar + i);
+        n = (SCSINT32_COP)pow(2, *ipar + i);
         ref = ref + n;
     }
     *y = (*u) & (ref);

diff --git a/scilab/modules/scicos_blocks/src/c/extract_bit_32_UH0.c b/scilab/modules/scicos_blocks/src/c/extract_bit_32_UH0.c
index f3d8154..6df0bbd 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/extract_bit_32_UH0.c
+++ b/scilab/modules/scicos_blocks/src/c/extract_bit_32_UH0.c
@@ -27,16 +27,16 @@
 SCICOS_BLOCKS_IMPEXP void extract_bit_32_UH0(scicos_block *block, int flag)
 {
     int i = 0, maxim = 0;
-    long *y = NULL, *u = NULL, ref = 0, n = 0;
+    SCSINT32_COP *y = NULL, *u = NULL, ref = 0, n = 0;
     y = Getint32OutPortPtrs(block, 1);
     u = Getint32InPortPtrs(block, 1);
     maxim = 32;
     ref = 0;
     for (i = 0; i < maxim / 2; i++)
     {
-        n = (long)pow(2, maxim / 2 + i);
+        n = (SCSINT32_COP)pow(2, maxim / 2 + i);
         ref = ref + n;
     }
     *y = (*u) & (ref);
 }
-/*--------------------------------------------------------------------------*/
\ No newline at end of file
+/*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/scicos_blocks/src/c/extract_bit_32_UH1.c b/scilab/modules/scicos_blocks/src/c/extract_bit_32_UH1.c
index 20fbd99..931b492 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/extract_bit_32_UH1.c
+++ b/scilab/modules/scicos_blocks/src/c/extract_bit_32_UH1.c
@@ -27,7 +27,7 @@
 SCICOS_BLOCKS_IMPEXP void extract_bit_32_UH1(scicos_block *block, int flag)
 {
     int i = 0, maxim = 0;
-    long *y = NULL, *u = NULL, ref = 0, n = 0;
+    SCSINT32_COP *y = NULL, *u = NULL, ref = 0, n = 0;
     y = Getint32OutPortPtrs(block, 1);
     u = Getint32InPortPtrs(block, 1);
     maxim = 32;

diff --git a/scilab/modules/scicos_blocks/src/c/extract_bit_u32_MSB1.c b/scilab/modules/scicos_blocks/src/c/extract_bit_u32_MSB1.c
index 1718e3b..5a67e03 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/extract_bit_u32_MSB1.c
+++ b/scilab/modules/scicos_blocks/src/c/extract_bit_u32_MSB1.c
@@ -27,7 +27,7 @@
 SCICOS_BLOCKS_IMPEXP void extract_bit_u32_MSB1(scicos_block *block, int flag)
 {
     int i = 0, maxim = 0;
-    unsigned long *y = NULL, *u = NULL, ref = 0, n = 0;
+    SCSUINT32_COP *y = NULL, *u = NULL, ref = 0, n = 0;
     int *ipar = NULL;
     y = Getuint32OutPortPtrs(block, 1);
     u = Getuint32InPortPtrs(block, 1);
@@ -36,7 +36,7 @@ SCICOS_BLOCKS_IMPEXP void extract_bit_u32_MSB1(scicos_block *block, int flag)
     ref = 0;
     for (i = 0; i < *ipar; i++)
     {
-        n = (unsigned long)pow(2, maxim - 1 - i);
+        n = (SCSUINT32_COP)pow(2, maxim - 1 - i);
         ref = ref + n;
     }
     *y = (*u) & (ref);

diff --git a/scilab/modules/scicos_blocks/src/c/extract_bit_u32_RB1.c b/scilab/modules/scicos_blocks/src/c/extract_bit_u32_RB1.c
index 29f04e6..632d276 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/extract_bit_u32_RB1.c
+++ b/scilab/modules/scicos_blocks/src/c/extract_bit_u32_RB1.c
@@ -27,7 +27,7 @@
 SCICOS_BLOCKS_IMPEXP void extract_bit_u32_RB1(scicos_block *block, int flag)
 {
     int i = 0, maxim = 0, numb = 0;
-    unsigned long *y = NULL, *u = NULL, ref = 0, n = 0;
+    SCSUINT32_COP *y = NULL, *u = NULL, ref = 0, n = 0;
     int *ipar = NULL;
     y = Getuint32OutPortPtrs(block, 1);
     u = Getuint32InPortPtrs(block, 1);
@@ -37,7 +37,7 @@ SCICOS_BLOCKS_IMPEXP void extract_bit_u32_RB1(scicos_block *block, int flag)
     numb = *(ipar + 1) - *ipar + 1;
     for (i = 0; i < numb; i++)
     {
-        n = (unsigned long)pow(2, *ipar + i);
+        n = (SCSUINT32_COP)pow(2, *ipar + i);
         ref = ref + n;
     }
     *y = (*u) & (ref);

diff --git a/scilab/modules/scicos_blocks/src/c/extract_bit_u32_UH1.c b/scilab/modules/scicos_blocks/src/c/extract_bit_u32_UH1.c
index 88afb6c..f39b905 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/extract_bit_u32_UH1.c
+++ b/scilab/modules/scicos_blocks/src/c/extract_bit_u32_UH1.c
@@ -27,7 +27,7 @@
 SCICOS_BLOCKS_IMPEXP void extract_bit_u32_UH1(scicos_block *block, int flag)
 {
     int i = 0, maxim = 0;
-    unsigned long *y = NULL, *u = NULL, ref = 0, n = 0;
+    SCSUINT32_COP *y = NULL, *u = NULL, ref = 0, n = 0;
 
     y = Getuint32OutPortPtrs(block, 1);
     u = Getuint32InPortPtrs(block, 1);
@@ -35,7 +35,7 @@ SCICOS_BLOCKS_IMPEXP void extract_bit_u32_UH1(scicos_block *block, int flag)
     ref = 0;
     for (i = 0; i < maxim / 2; i++)
     {
-        n = (unsigned long)pow(2, maxim / 2 + i);
+        n = (SCSUINT32_COP)pow(2, maxim / 2 + i);
         ref = ref + n;
     }
     *y = (*u) & (ref);

diff --git a/scilab/modules/scicos_blocks/src/c/fromws_c.c b/scilab/modules/scicos_blocks/src/c/fromws_c.c
index 0109624..26e97ea 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/fromws_c.c
+++ b/scilab/modules/scicos_blocks/src/c/fromws_c.c
@@ -388,7 +388,7 @@ SCICOS_BLOCKS_IMPEXP void fromws_c(scicos_block *block, int flag)
                     C2F(mgetnc) (&fd, ptr_s, (j = nPoints * mY * nY, &j), fmts, &ierr); /* read short data */
                     break;
                 case 4 :   /* int32 */
-                    if ((ptr->work = (void *) scicos_malloc(nPoints * mY * nY * sizeof(long))) == NULL)
+                    if ((ptr->work = (void *) scicos_malloc(nPoints * mY * nY * sizeof(SCSINT32_COP))) == NULL)
                     {
                         set_block_error(-16);
                         scicos_free(ptr);
@@ -424,7 +424,7 @@ SCICOS_BLOCKS_IMPEXP void fromws_c(scicos_block *block, int flag)
                     C2F(mgetnc) (&fd, ptr_us, (j = nPoints * mY * nY, &j), fmtus, &ierr); /* read short data */
                     break;
                 case 14 :  /* uint32 */
-                    if ((ptr->work = (void *) scicos_malloc(nPoints * mY * nY * sizeof(unsigned long))) == NULL)
+                    if ((ptr->work = (void *) scicos_malloc(nPoints * mY * nY * sizeof(SCSUINT32_COP))) == NULL)
                     {
                         set_block_error(-16);
                         scicos_free(ptr);
@@ -902,7 +902,7 @@ SCICOS_BLOCKS_IMPEXP void fromws_c(scicos_block *block, int flag)
                         case 4:
                             /* ---------------------int32 long--------------------- */
                             y_l = Getint32OutPortPtrs(block, 1);
-                            ptr_l = (long*) ptr->work;
+                            ptr_l = (SCSINT32_COP *) ptr->work;
                             if (inow > nPoints)
                             {
                                 if (OutEnd == 0)
@@ -986,7 +986,7 @@ SCICOS_BLOCKS_IMPEXP void fromws_c(scicos_block *block, int flag)
                         case 14:
                             /* ---------------------uint32 ulong--------------------- */
                             y_ul = Getuint32OutPortPtrs(block, 1);
-                            ptr_ul = (unsigned long*) ptr->work;
+                            ptr_ul = (SCSUINT32_COP *) ptr->work;
                             if (inow > nPoints)
                             {
                                 if (OutEnd == 0)
@@ -1212,7 +1212,7 @@ SCICOS_BLOCKS_IMPEXP void fromws_c(scicos_block *block, int flag)
                         case 4:
                             /* ---------------------int32 long--------------------- */
                             y_l = Getint32OutPortPtrs(block, 1);
-                            ptr_l = (long*) ptr->work;
+                            ptr_l = (SCSINT32_COP *) ptr->work;
                             /*y_l[j]=ptr_l[inow+(j)*nPoints];*/
                             if (inow > nPoints)
                             {
@@ -1242,7 +1242,7 @@ SCICOS_BLOCKS_IMPEXP void fromws_c(scicos_block *block, int flag)
                                 t2 = ptr->workt[inow + 1];
                                 y1 = (double)ptr_l[inow + j * nPoints];
                                 y2 = (double)ptr_l[inow + 1 + j * nPoints];
-                                y_l[j] = (long)((y2 - y1) * (t - t1) / (t2 - t1) + y1);
+                                y_l[j] = (SCSINT32_COP)((y2 - y1) * (t - t1) / (t2 - t1) + y1);
                             }
                             break;
                         case 11: /*--------------------- uint8 uchar---------------------*/
@@ -1319,7 +1319,7 @@ SCICOS_BLOCKS_IMPEXP void fromws_c(scicos_block *block, int flag)
                         case 14:
                             /* ---------------------uint32 ulong--------------------- */
                             y_ul = Getuint32OutPortPtrs(block, 1);
-                            ptr_ul = (unsigned long*) ptr->work;
+                            ptr_ul = (SCSUINT32_COP *) ptr->work;
                             /* y_ul[j]=ptr_ul[inow+(j)*nPoints]; */
                             if (inow > nPoints)
                             {
@@ -1349,7 +1349,7 @@ SCICOS_BLOCKS_IMPEXP void fromws_c(scicos_block *block, int flag)
                                 t2 = ptr->workt[inow + 1];
                                 y1 = (double)ptr_ul[inow + j * nPoints];
                                 y2 = (double)ptr_ul[inow + 1 + j * nPoints];
-                                y_ul[j] = (unsigned long)((y2 - y1) * (t - t1) / (t2 - t1) + y1);
+                                y_ul[j] = (SCSUINT32_COP)((y2 - y1) * (t - t1) / (t2 - t1) + y1);
                             }
                             break;
                     }

diff --git a/scilab/modules/scicos_blocks/src/c/gainblk_i32e.c b/scilab/modules/scicos_blocks/src/c/gainblk_i32e.c
index c982e6f..d290754 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/gainblk_i32e.c
+++ b/scilab/modules/scicos_blocks/src/c/gainblk_i32e.c
@@ -32,9 +32,9 @@ SCICOS_BLOCKS_IMPEXP void gainblk_i32e(scicos_block *block, int flag)
     if ((flag == 1) | (flag == 6))
     {
         int i = 0, j = 0, l = 0, ji = 0, jl = 0, il = 0;
-        long *u = NULL, *y = NULL;
+        SCSINT32_COP *u = NULL, *y = NULL;
         int mu = 0, ny = 0, my = 0, mo = 0, no = 0;
-        long *opar = NULL;
+        SCSINT32_COP *opar = NULL;
         double k = 0., D = 0., C = 0.;
 
         mo = GetOparSize(block, 1, 1);
@@ -60,7 +60,7 @@ SCICOS_BLOCKS_IMPEXP void gainblk_i32e(scicos_block *block, int flag)
                 }
                 else
                 {
-                    y[i] = (long)D;
+                    y[i] = (SCSINT32_COP)D;
                 }
             }
         }
@@ -88,7 +88,7 @@ SCICOS_BLOCKS_IMPEXP void gainblk_i32e(scicos_block *block, int flag)
                     }
                     else
                     {
-                        y[jl] = (long)D;
+                        y[jl] = (SCSINT32_COP)D;
                     }
                 }
             }

diff --git a/scilab/modules/scicos_blocks/src/c/gainblk_i32n.c b/scilab/modules/scicos_blocks/src/c/gainblk_i32n.c
index b87350b..ceb99cc 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/gainblk_i32n.c
+++ b/scilab/modules/scicos_blocks/src/c/gainblk_i32n.c
@@ -29,9 +29,9 @@ SCICOS_BLOCKS_IMPEXP void gainblk_i32n(scicos_block *block, int flag)
     if ((flag == 1) | (flag == 6))
     {
         int i = 0, j = 0, l = 0, ji = 0, jl = 0, il = 0;
-        long *u = NULL, *y = NULL;
+        SCSINT32_COP *u = NULL, *y = NULL;
         int mu = 0, ny = 0, my = 0, mo = 0, no = 0;
-        long *opar = NULL;
+        SCSINT32_COP *opar = NULL;
         double k = 0., D = 0., C = 0., t = 0.;
 
         mo = GetOparSize(block, 1, 1);
@@ -61,7 +61,7 @@ SCICOS_BLOCKS_IMPEXP void gainblk_i32n(scicos_block *block, int flag)
                         (t) = -(-((k / 2)) + fabs(t - (double)((int)((t) / ((k / 2)))) * ((k / 2))));
                     }
                 }
-                y[i] = (long)t;
+                y[i] = (SCSINT32_COP)t;
             }
         }
         else
@@ -92,7 +92,7 @@ SCICOS_BLOCKS_IMPEXP void gainblk_i32n(scicos_block *block, int flag)
                             (t) = -(-((k / 2)) + fabs(t - (double)((int)((t) / ((k / 2)))) * ((k / 2))));
                         }
                     }
-                    y[jl] = (long)t;
+                    y[jl] = (SCSINT32_COP)t;
                 }
             }
         }

diff --git a/scilab/modules/scicos_blocks/src/c/gainblk_i32s.c b/scilab/modules/scicos_blocks/src/c/gainblk_i32s.c
index 359ba82..642a781 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/gainblk_i32s.c
+++ b/scilab/modules/scicos_blocks/src/c/gainblk_i32s.c
@@ -29,9 +29,9 @@ SCICOS_BLOCKS_IMPEXP void gainblk_i32s(scicos_block *block, int flag)
     if ((flag == 1) | (flag == 6))
     {
         int i = 0, j = 0, l = 0, ji = 0, jl = 0, il = 0;
-        long *u = NULL, *y = NULL;
+        SCSINT32_COP *u = NULL, *y = NULL;
         int mu = 0, ny = 0, my = 0, mo = 0, no = 0;
-        long *opar = NULL;
+        SCSINT32_COP *opar = NULL;
         double k = 0., D = 0., C = 0.;
 
         mo = GetOparSize(block, 1, 1);
@@ -57,7 +57,7 @@ SCICOS_BLOCKS_IMPEXP void gainblk_i32s(scicos_block *block, int flag)
                 {
                     D = -k;
                 }
-                y[i] = (long)D;
+                y[i] = (SCSINT32_COP)D;
             }
         }
         else
@@ -84,7 +84,7 @@ SCICOS_BLOCKS_IMPEXP void gainblk_i32s(scicos_block *block, int flag)
                     {
                         D = -k;
                     }
-                    y[jl] = (long)D;
+                    y[jl] = (SCSINT32_COP)D;
                 }
             }
         }

diff --git a/scilab/modules/scicos_blocks/src/c/gainblk_ui32e.c b/scilab/modules/scicos_blocks/src/c/gainblk_ui32e.c
index 2486602..4a249f3 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/gainblk_ui32e.c
+++ b/scilab/modules/scicos_blocks/src/c/gainblk_ui32e.c
@@ -32,9 +32,9 @@ SCICOS_BLOCKS_IMPEXP void gainblk_ui32e(scicos_block *block, int flag)
     if ((flag == 1) | (flag == 6))
     {
         int i = 0, j = 0, l = 0, ji = 0, jl = 0, il = 0;
-        unsigned long *u = NULL, *y = NULL;
+        SCSUINT32_COP *u = NULL, *y = NULL;
         int mu = 0, ny = 0, my = 0, mo = 0, no = 0;
-        unsigned long *opar = NULL;
+        SCSUINT32_COP *opar = NULL;
         double k = 0., D = 0., C = 0.;
 
         mo = GetOparSize(block, 1, 1);
@@ -60,7 +60,7 @@ SCICOS_BLOCKS_IMPEXP void gainblk_ui32e(scicos_block *block, int flag)
                 }
                 else
                 {
-                    y[i] = (unsigned long)D;
+                    y[i] = (SCSUINT32_COP)D;
                 }
             }
         }
@@ -88,7 +88,7 @@ SCICOS_BLOCKS_IMPEXP void gainblk_ui32e(scicos_block *block, int flag)
                     }
                     else
                     {
-                        y[jl] = (unsigned long)D;
+                        y[jl] = (SCSUINT32_COP)D;
                     }
                 }
             }

diff --git a/scilab/modules/scicos_blocks/src/c/gainblk_ui32n.c b/scilab/modules/scicos_blocks/src/c/gainblk_ui32n.c
index c2e074f..2e7425d 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/gainblk_ui32n.c
+++ b/scilab/modules/scicos_blocks/src/c/gainblk_ui32n.c
@@ -29,9 +29,9 @@ SCICOS_BLOCKS_IMPEXP void gainblk_ui32n(scicos_block *block, int flag)
     if ((flag == 1) | (flag == 6))
     {
         int i = 0, j = 0, l = 0, ji = 0, jl = 0, il = 0;
-        unsigned long *u = NULL, *y = NULL;
+        SCSUINT32_COP *u = NULL, *y = NULL;
         int mu = 0, ny = 0, my = 0, mo = 0, no = 0;
-        unsigned long *opar = NULL;
+        SCSUINT32_COP *opar = NULL;
         double k = 0., D = 0., C = 0., t = 0.;
 
         mo = GetOparSize(block, 1, 1);
@@ -61,7 +61,7 @@ SCICOS_BLOCKS_IMPEXP void gainblk_ui32n(scicos_block *block, int flag)
                         (t) = -(-((k / 2)) + fabs(t - (double)((int)((t) / ((k / 2)))) * ((k / 2))));
                     }
                 }
-                y[i] = (unsigned long)t;
+                y[i] = (SCSUINT32_COP)t;
             }
         }
         else
@@ -92,7 +92,7 @@ SCICOS_BLOCKS_IMPEXP void gainblk_ui32n(scicos_block *block, int flag)
                             (t) = -(-((k / 2)) + fabs(t - (double)((int)((t) / ((k / 2)))) * ((k / 2))));
                         }
                     }
-                    y[jl] = (unsigned long)t;
+                    y[jl] = (SCSUINT32_COP)t;
                 }
             }
         }

diff --git a/scilab/modules/scicos_blocks/src/c/gainblk_ui32s.c b/scilab/modules/scicos_blocks/src/c/gainblk_ui32s.c
index 50fa69b..df0fd6f 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/gainblk_ui32s.c
+++ b/scilab/modules/scicos_blocks/src/c/gainblk_ui32s.c
@@ -29,9 +29,9 @@ SCICOS_BLOCKS_IMPEXP void gainblk_ui32s(scicos_block *block, int flag)
     if ((flag == 1) | (flag == 6))
     {
         int i = 0, j = 0, l = 0, ji = 0, jl = 0, il = 0;
-        unsigned long *u = NULL, *y = NULL;
+        SCSUINT32_COP *u = NULL, *y = NULL;
         int mu = 0, ny = 0, my = 0, mo = 0, no = 0;
-        unsigned long *opar = NULL;
+        SCSUINT32_COP *opar = NULL;
         double k = 0., D = 0., C = 0.;
 
         mo = GetOparSize(block, 1, 1);
@@ -57,7 +57,7 @@ SCICOS_BLOCKS_IMPEXP void gainblk_ui32s(scicos_block *block, int flag)
                 {
                     D = 0;
                 }
-                y[i] = (unsigned long)D;
+                y[i] = (SCSUINT32_COP)D;
             }
         }
         else
@@ -84,7 +84,7 @@ SCICOS_BLOCKS_IMPEXP void gainblk_ui32s(scicos_block *block, int flag)
                     {
                         D = 0;
                     }
-                    y[jl] = (unsigned long)D;
+                    y[jl] = (SCSUINT32_COP)D;
                 }
             }
         }

diff --git a/scilab/modules/scicos_blocks/src/c/logicalop_i32.c b/scilab/modules/scicos_blocks/src/c/logicalop_i32.c
index 3fd1536..139bf9e 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/logicalop_i32.c
+++ b/scilab/modules/scicos_blocks/src/c/logicalop_i32.c
@@ -28,7 +28,7 @@ SCICOS_BLOCKS_IMPEXP void logicalop_i32(scicos_block *block, int flag)
 {
     int i = 0, m = 0, n = 0, nin = 0, k = 0, j = 0, l = 0;
     int *ipar = NULL;
-    long *y = NULL, *u = NULL;
+    SCSINT32_COP *y = NULL, *u = NULL;
     m = GetInPortRows(block, 1);
     n = GetInPortCols(block, 1);
     y = Getint32OutPortPtrs(block, 1);
@@ -285,7 +285,7 @@ SCICOS_BLOCKS_IMPEXP void logicalop_i32(scicos_block *block, int flag)
                             l = (l + 1) % 2;
                         }
                     }
-                    *y = (long)l;
+                    *y = (SCSINT32_COP)l;
                 }
                 else
                 {
@@ -311,7 +311,7 @@ SCICOS_BLOCKS_IMPEXP void logicalop_i32(scicos_block *block, int flag)
                                 l = (l + 1) % 2;
                             }
                         }
-                        y[i] = (long)l;
+                        y[i] = (SCSINT32_COP)l;
                     }
                 }
                 else

diff --git a/scilab/modules/scicos_blocks/src/c/logicalop_ui32.c b/scilab/modules/scicos_blocks/src/c/logicalop_ui32.c
index e172814..44d1290 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/logicalop_ui32.c
+++ b/scilab/modules/scicos_blocks/src/c/logicalop_ui32.c
@@ -28,7 +28,7 @@ SCICOS_BLOCKS_IMPEXP void logicalop_ui32(scicos_block *block, int flag)
 {
     int i = 0, m = 0, n = 0, nin = 0, k = 0, j = 0, l = 0;
     int *ipar = NULL;
-    unsigned long *y = NULL, *u = NULL;
+    SCSUINT32_COP *y = NULL, *u = NULL;
     m = GetInPortRows(block, 1);
     n = GetInPortCols(block, 1);
     y = Getuint32OutPortPtrs(block, 1);
@@ -285,7 +285,7 @@ SCICOS_BLOCKS_IMPEXP void logicalop_ui32(scicos_block *block, int flag)
                             l = (l + 1) % 2;
                         }
                     }
-                    *y = (unsigned long)l;
+                    *y = (SCSUINT32_COP)l;
                 }
                 else
                 {
@@ -311,7 +311,7 @@ SCICOS_BLOCKS_IMPEXP void logicalop_ui32(scicos_block *block, int flag)
                                 l = (l + 1) % 2;
                             }
                         }
-                        y[i] = (unsigned long)l;
+                        y[i] = (SCSUINT32_COP)l;
                     }
                 }
                 else

diff --git a/scilab/modules/scicos_blocks/src/c/m_frequ.c b/scilab/modules/scicos_blocks/src/c/m_frequ.c
index 5b42965..cada8b2 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/m_frequ.c
+++ b/scilab/modules/scicos_blocks/src/c/m_frequ.c
@@ -31,7 +31,7 @@ SCICOS_BLOCKS_IMPEXP void m_frequ(scicos_block *block, int flag)
     double *mat = NULL;
     double *Dt = NULL;
     double *off = NULL;
-    long *icount = NULL;
+    SCSINT32_COP *icount = NULL;
     double t = 0.0;
     long long *counter = NULL;
     int m = 0;

diff --git a/scilab/modules/scicos_blocks/src/c/matbyscal_e.c b/scilab/modules/scicos_blocks/src/c/matbyscal_e.c
index 3f3d958..0e778cf 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/matbyscal_e.c
+++ b/scilab/modules/scicos_blocks/src/c/matbyscal_e.c
@@ -43,9 +43,9 @@ SCICOS_BLOCKS_IMPEXP void matbyscal_e(scicos_block *block, int flag)
             case SCSINT32_N :
             {
 
-                long *u1 = Getint32InPortPtrs(block, 1);
-                long *u2 = Getint32InPortPtrs(block, 2);
-                long *y1 = Getint32OutPortPtrs(block, 1);
+                SCSINT32_COP *u1 = Getint32InPortPtrs(block, 1);
+                SCSINT32_COP *u2 = Getint32InPortPtrs(block, 2);
+                SCSINT32_COP *y1 = Getint32OutPortPtrs(block, 1);
                 for (i = 0; i < mu * nu; i++)
                 {
                     v = (double)u1[i] * (double)u2[0];
@@ -57,7 +57,7 @@ SCICOS_BLOCKS_IMPEXP void matbyscal_e(scicos_block *block, int flag)
                     }
                     else
                     {
-                        y1[i] = (long)v;
+                        y1[i] = (SCSINT32_COP)v;
                     }
                 }
                 break;
@@ -112,9 +112,9 @@ SCICOS_BLOCKS_IMPEXP void matbyscal_e(scicos_block *block, int flag)
             case SCSUINT32_N :
             {
 
-                unsigned long *u1 = Getuint32InPortPtrs(block, 1);
-                unsigned long *u2 = Getuint32InPortPtrs(block, 2);
-                unsigned long *y1 = Getuint32OutPortPtrs(block, 1);
+                SCSUINT32_COP *u1 = Getuint32InPortPtrs(block, 1);
+                SCSUINT32_COP *u2 = Getuint32InPortPtrs(block, 2);
+                SCSUINT32_COP *y1 = Getuint32OutPortPtrs(block, 1);
                 for (i = 0; i < mu * nu; i++)
                 {
                     v = (double)u1[i] * (double)u2[0];
@@ -126,7 +126,7 @@ SCICOS_BLOCKS_IMPEXP void matbyscal_e(scicos_block *block, int flag)
                     }
                     else
                     {
-                        y1[i] = (unsigned long)v;
+                        y1[i] = (SCSUINT32_COP)v;
                     }
                 }
                 break;

diff --git a/scilab/modules/scicos_blocks/src/c/matbyscal_s.c b/scilab/modules/scicos_blocks/src/c/matbyscal_s.c
index d48f4da..b5c0298 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/matbyscal_s.c
+++ b/scilab/modules/scicos_blocks/src/c/matbyscal_s.c
@@ -39,9 +39,9 @@ SCICOS_BLOCKS_IMPEXP void matbyscal_s(scicos_block *block, int flag)
             case SCSINT32_N :
             {
 
-                long *u1 = Getint32InPortPtrs(block, 1);
-                long *u2 = Getint32InPortPtrs(block, 2);
-                long *y1 = Getint32OutPortPtrs(block, 1);
+                SCSINT32_COP *u1 = Getint32InPortPtrs(block, 1);
+                SCSINT32_COP *u2 = Getint32InPortPtrs(block, 2);
+                SCSINT32_COP *y1 = Getint32OutPortPtrs(block, 1);
                 for (i = 0; i < mu * nu; i++)
                 {
                     v = (double)u1[i] * (double)u2[0];
@@ -53,7 +53,7 @@ SCICOS_BLOCKS_IMPEXP void matbyscal_s(scicos_block *block, int flag)
                     {
                         v = rpar[1];
                     }
-                    y1[i] = (long)v;
+                    y1[i] = (SCSINT32_COP)v;
                 }
                 break;
             }
@@ -105,9 +105,9 @@ SCICOS_BLOCKS_IMPEXP void matbyscal_s(scicos_block *block, int flag)
             case SCSUINT32_N :
             {
 
-                unsigned long *u1 = Getuint32InPortPtrs(block, 1);
-                unsigned long *u2 = Getuint32InPortPtrs(block, 2);
-                unsigned long *y1 = Getuint32OutPortPtrs(block, 1);
+                SCSUINT32_COP *u1 = Getuint32InPortPtrs(block, 1);
+                SCSUINT32_COP *u2 = Getuint32InPortPtrs(block, 2);
+                SCSUINT32_COP *y1 = Getuint32OutPortPtrs(block, 1);
                 for (i = 0; i < mu * nu; i++)
                 {
                     v = (double)u1[i] * (double)u2[0];
@@ -119,7 +119,7 @@ SCICOS_BLOCKS_IMPEXP void matbyscal_s(scicos_block *block, int flag)
                     {
                         v = rpar[1];
                     }
-                    y1[i] = (unsigned long)v;
+                    y1[i] = (SCSUINT32_COP)v;
                 }
                 break;
             }

diff --git a/scilab/modules/scicos_blocks/src/c/matmul_i32e.c b/scilab/modules/scicos_blocks/src/c/matmul_i32e.c
index 5d8a115..8129fa9 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/matmul_i32e.c
+++ b/scilab/modules/scicos_blocks/src/c/matmul_i32e.c
@@ -34,9 +34,9 @@ SCICOS_BLOCKS_IMPEXP void matmul_i32e(scicos_block *block, int flag)
         int mu1 = GetInPortRows(block, 1);
         int nu1 = GetInPortCols(block, 1);
         int nu2 = GetInPortCols(block, 2);
-        long *u1 = Getint32InPortPtrs(block, 1);
-        long *u2 = Getint32InPortPtrs(block, 2);
-        long *y = Getint32OutPortPtrs(block, 1);
+        SCSINT32_COP *u1 = Getint32InPortPtrs(block, 1);
+        SCSINT32_COP *u2 = Getint32InPortPtrs(block, 2);
+        SCSINT32_COP *y = Getint32OutPortPtrs(block, 1);
 
         double k = pow(2, 32);
         int l = 0;
@@ -65,7 +65,7 @@ SCICOS_BLOCKS_IMPEXP void matmul_i32e(scicos_block *block, int flag)
                 }
                 else
                 {
-                    y[jl] = (long)(D);
+                    y[jl] = (SCSINT32_COP)(D);
                 }
             }
         }

diff --git a/scilab/modules/scicos_blocks/src/c/matmul_i32n.c b/scilab/modules/scicos_blocks/src/c/matmul_i32n.c
index 44c5130..49c8838 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/matmul_i32n.c
+++ b/scilab/modules/scicos_blocks/src/c/matmul_i32n.c
@@ -30,9 +30,9 @@ SCICOS_BLOCKS_IMPEXP void matmul_i32n(scicos_block *block, int flag)
         int mu1 = GetInPortRows(block, 1);
         int nu1 = GetInPortCols(block, 1);
         int nu2 = GetInPortCols(block, 2);
-        long *u1 = Getint32InPortPtrs(block, 1);
-        long *u2 = Getint32InPortPtrs(block, 2);
-        long *y = Getint32OutPortPtrs(block, 1);
+        SCSINT32_COP *u1 = Getint32InPortPtrs(block, 1);
+        SCSINT32_COP *u2 = Getint32InPortPtrs(block, 2);
+        SCSINT32_COP *y = Getint32OutPortPtrs(block, 1);
 
         double k = pow(2, 32);
         int l = 0;
@@ -64,7 +64,7 @@ SCICOS_BLOCKS_IMPEXP void matmul_i32n(scicos_block *block, int flag)
                         (t) = -(-((k / 2)) + fabs(t - (double)((int)((t) / ((k / 2)))) * ((k / 2))));
                     }
                 }
-                y[jl] = (long)t;
+                y[jl] = (SCSINT32_COP)t;
             }
         }
     }

diff --git a/scilab/modules/scicos_blocks/src/c/matmul_i32s.c b/scilab/modules/scicos_blocks/src/c/matmul_i32s.c
index 358abfe..ffd7628 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/matmul_i32s.c
+++ b/scilab/modules/scicos_blocks/src/c/matmul_i32s.c
@@ -27,7 +27,7 @@ SCICOS_BLOCKS_IMPEXP void matmul_i32s(scicos_block *block, int flag)
 {
     if ((flag == 1) | (flag == 6))
     {
-        long *u1, *u2, *y;
+        SCSINT32_COP *u1, *u2, *y;
         double k, C, D;
         int mu1, nu1, nu2, i, j, l, ji, jl, il;
         int *ipar;
@@ -57,15 +57,15 @@ SCICOS_BLOCKS_IMPEXP void matmul_i32s(scicos_block *block, int flag)
                 }
                 if ((D) > ((k / 2) - 1))
                 {
-                    y[jl] = (long)((k / 2) - 1);
+                    y[jl] = (SCSINT32_COP)((k / 2) - 1);
                 }
                 else if ((D) < -((k / 2)))
                 {
-                    y[jl] = -(long)((k / 2));
+                    y[jl] = -(SCSINT32_COP)((k / 2));
                 }
                 else
                 {
-                    y[jl] = (long)(D);
+                    y[jl] = (SCSINT32_COP)(D);
                 }
             }
         }

diff --git a/scilab/modules/scicos_blocks/src/c/matmul_ui32e.c b/scilab/modules/scicos_blocks/src/c/matmul_ui32e.c
index a326fad..7f0fbf4 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/matmul_ui32e.c
+++ b/scilab/modules/scicos_blocks/src/c/matmul_ui32e.c
@@ -31,7 +31,7 @@ SCICOS_BLOCKS_IMPEXP void matmul_ui32e(scicos_block *block, int flag)
 {
     if ((flag == 1) | (flag == 6))
     {
-        unsigned long *u1, *u2, *y;
+        SCSUINT32_COP *u1, *u2, *y;
         double k, C, D;
         int mu1, nu1, nu2, i, j, l, ji, jl, il;
         int *ipar;
@@ -67,7 +67,7 @@ SCICOS_BLOCKS_IMPEXP void matmul_ui32e(scicos_block *block, int flag)
                 }
                 else
                 {
-                    y[jl] = (unsigned long)(D);
+                    y[jl] = (SCSUINT32_COP)(D);
                 }
             }
         }

diff --git a/scilab/modules/scicos_blocks/src/c/matmul_ui32n.c b/scilab/modules/scicos_blocks/src/c/matmul_ui32n.c
index ada8b32..246f10f 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/matmul_ui32n.c
+++ b/scilab/modules/scicos_blocks/src/c/matmul_ui32n.c
@@ -27,7 +27,7 @@ SCICOS_BLOCKS_IMPEXP void matmul_ui32n(scicos_block *block, int flag)
 {
     if ((flag == 1) | (flag == 6))
     {
-        unsigned long *u1, *u2, *y;
+        SCSUINT32_COP *u1, *u2, *y;
         double k, C, D, t;
         int mu1, nu1, nu2, i, j, l, ji, jl, il;
         int *ipar;
@@ -56,7 +56,7 @@ SCICOS_BLOCKS_IMPEXP void matmul_ui32n(scicos_block *block, int flag)
                     D = D + C;
                 }
                 t = D - (int)(D / (k)) * ((k));
-                y[jl] = (unsigned long)t;
+                y[jl] = (SCSUINT32_COP)t;
             }
         }
     }

diff --git a/scilab/modules/scicos_blocks/src/c/matmul_ui32s.c b/scilab/modules/scicos_blocks/src/c/matmul_ui32s.c
index adb1716..6b5e5e6 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/matmul_ui32s.c
+++ b/scilab/modules/scicos_blocks/src/c/matmul_ui32s.c
@@ -30,9 +30,9 @@ SCICOS_BLOCKS_IMPEXP void matmul_ui32s(scicos_block *block, int flag)
         int mu1 = GetInPortRows(block, 1);
         int nu1 = GetInPortCols(block, 1);
         int nu2 = GetInPortCols(block, 2);
-        unsigned long *u1 = Getuint32InPortPtrs(block, 1);
-        unsigned long *u2 = Getuint32InPortPtrs(block, 2);
-        unsigned long *y = Getuint32OutPortPtrs(block, 1);
+        SCSUINT32_COP *u1 = Getuint32InPortPtrs(block, 1);
+        SCSUINT32_COP *u2 = Getuint32InPortPtrs(block, 2);
+        SCSUINT32_COP *y = Getuint32OutPortPtrs(block, 1);
 
         double k = pow(2, 32);
 
@@ -55,7 +55,7 @@ SCICOS_BLOCKS_IMPEXP void matmul_ui32s(scicos_block *block, int flag)
                 }
                 if (D > (k - 1))
                 {
-                    y[jl] = (unsigned long)(k - 1);
+                    y[jl] = (SCSUINT32_COP)(k - 1);
                 }
                 else if (D < 0)
                 {
@@ -63,7 +63,7 @@ SCICOS_BLOCKS_IMPEXP void matmul_ui32s(scicos_block *block, int flag)
                 }
                 else
                 {
-                    y[jl] = (unsigned long)(D);
+                    y[jl] = (SCSUINT32_COP)(D);
                 }
             }
         }

diff --git a/scilab/modules/scicos_blocks/src/c/relational_op_i32.c b/scilab/modules/scicos_blocks/src/c/relational_op_i32.c
index d8808bf..e4c0bb4 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/relational_op_i32.c
+++ b/scilab/modules/scicos_blocks/src/c/relational_op_i32.c
@@ -30,9 +30,9 @@ SCICOS_BLOCKS_IMPEXP void relational_op_i32(scicos_block *block, int flag)
 
     int m = GetInPortRows(block, 1);
     int n = GetInPortCols(block, 1);
-    long *u1 = Getint32InPortPtrs(block, 1);
-    long *u2 = Getint32InPortPtrs(block, 2);
-    long *y = Getint32OutPortPtrs(block, 1);
+    SCSINT32_COP *u1 = Getint32InPortPtrs(block, 1);
+    SCSINT32_COP *u2 = Getint32InPortPtrs(block, 2);
+    SCSINT32_COP *y = Getint32OutPortPtrs(block, 1);
     int *ipar = GetIparPtrs(block);
 
     if (flag == 1)

diff --git a/scilab/modules/scicos_blocks/src/c/relational_op_ui32.c b/scilab/modules/scicos_blocks/src/c/relational_op_ui32.c
index 162a864..9a13981 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/relational_op_ui32.c
+++ b/scilab/modules/scicos_blocks/src/c/relational_op_ui32.c
@@ -30,9 +30,9 @@ SCICOS_BLOCKS_IMPEXP void relational_op_ui32(scicos_block *block, int flag)
 
     int m = GetInPortRows(block, 1);
     int n = GetInPortCols(block, 1);
-    unsigned long *u1 = Getuint32InPortPtrs(block, 1);
-    unsigned long *u2 = Getuint32InPortPtrs(block, 2);
-    unsigned long *y = Getuint32OutPortPtrs(block, 1);
+    SCSUINT32_COP *u1 = Getuint32InPortPtrs(block, 1);
+    SCSUINT32_COP *u2 = Getuint32InPortPtrs(block, 2);
+    SCSUINT32_COP *y = Getuint32OutPortPtrs(block, 1);
     int *ipar = GetIparPtrs(block);
 
     if (flag == 1)

diff --git a/scilab/modules/scicos_blocks/src/c/shift_32_LA.c b/scilab/modules/scicos_blocks/src/c/shift_32_LA.c
index 28948c4..3116719 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/shift_32_LA.c
+++ b/scilab/modules/scicos_blocks/src/c/shift_32_LA.c
@@ -28,8 +28,8 @@ SCICOS_BLOCKS_IMPEXP void shift_32_LA(scicos_block *block, int flag)
     int i = 0;
     int mu = GetInPortRows(block, 1);
     int nu = GetInPortCols(block, 1);
-    long *u = Getint32InPortPtrs(block, 1);
-    long *y = Getint32OutPortPtrs(block, 1);
+    SCSINT32_COP *u = Getint32InPortPtrs(block, 1);
+    SCSINT32_COP *y = Getint32OutPortPtrs(block, 1);
     int *ipar = GetIparPtrs(block);
     for (i = 0; i < mu * nu; i++)
     {

diff --git a/scilab/modules/scicos_blocks/src/c/shift_32_LC.c b/scilab/modules/scicos_blocks/src/c/shift_32_LC.c
index dedd92e..7d37807 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/shift_32_LC.c
+++ b/scilab/modules/scicos_blocks/src/c/shift_32_LC.c
@@ -27,8 +27,8 @@ SCICOS_BLOCKS_IMPEXP void shift_32_LC(scicos_block *block, int flag)
 {
     int mu = GetInPortRows(block, 1);
     int nu = GetInPortCols(block, 1);
-    long *u = Getint32InPortPtrs(block, 1);
-    long *y = Getint32OutPortPtrs(block, 1);
+    SCSINT32_COP *u = Getint32InPortPtrs(block, 1);
+    SCSINT32_COP *y = Getint32OutPortPtrs(block, 1);
     int *ipar = GetIparPtrs(block);
     unsigned long k = (unsigned long)pow(2, 32 - 1);
 
@@ -36,7 +36,7 @@ SCICOS_BLOCKS_IMPEXP void shift_32_LC(scicos_block *block, int flag)
     for (i = 0; i < mu * nu; i++)
     {
         int j = 0;
-        long v = u[i];
+        SCSINT32_COP v = u[i];
         for (j = 0; j < ipar[0]; j++)
         {
             y[i] = v & k;

diff --git a/scilab/modules/scicos_blocks/src/c/shift_32_RA.c b/scilab/modules/scicos_blocks/src/c/shift_32_RA.c
index 9b7f607..317efc3 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/shift_32_RA.c
+++ b/scilab/modules/scicos_blocks/src/c/shift_32_RA.c
@@ -28,8 +28,8 @@ SCICOS_BLOCKS_IMPEXP void shift_32_RA(scicos_block *block, int flag)
     int i = 0;
     int mu = GetInPortRows(block, 1);
     int nu = GetInPortCols(block, 1);
-    long *u = Getint32InPortPtrs(block, 1);
-    long *y = Getint32OutPortPtrs(block, 1);
+    SCSINT32_COP *u = Getint32InPortPtrs(block, 1);
+    SCSINT32_COP *y = Getint32OutPortPtrs(block, 1);
     int *ipar = GetIparPtrs(block);
     for (i = 0; i < mu * nu; i++)
     {

diff --git a/scilab/modules/scicos_blocks/src/c/shift_32_RC.c b/scilab/modules/scicos_blocks/src/c/shift_32_RC.c
index 89e4daa..63597a0 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/shift_32_RC.c
+++ b/scilab/modules/scicos_blocks/src/c/shift_32_RC.c
@@ -29,14 +29,14 @@ SCICOS_BLOCKS_IMPEXP void shift_32_RC(scicos_block *block, int flag)
 
     int mu = GetInPortRows(block, 1);
     int nu = GetInPortCols(block, 1);
-    long *u = Getint32InPortPtrs(block, 1);
-    long *y = Getint32OutPortPtrs(block, 1);
+    SCSINT32_COP *u = Getint32InPortPtrs(block, 1);
+    SCSINT32_COP *y = Getint32OutPortPtrs(block, 1);
     int *ipar = GetIparPtrs(block);
     unsigned long k = (unsigned long)pow(2, 32 - 1);
 
     for (i = 0; i < mu * nu; i++)
     {
-        long v = u[i];
+         SCSINT32_COP v = u[i];
         for (j = 0; j < -ipar[0]; j++)
         {
             y[i] = v & 1;

diff --git a/scilab/modules/scicos_blocks/src/c/shift_u32_RA.c b/scilab/modules/scicos_blocks/src/c/shift_u32_RA.c
index 6a05e52..bae1140 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/shift_u32_RA.c
+++ b/scilab/modules/scicos_blocks/src/c/shift_u32_RA.c
@@ -28,8 +28,8 @@ SCICOS_BLOCKS_IMPEXP void shift_u32_RA(scicos_block *block, int flag)
     int i = 0;
     int mu = GetInPortRows(block, 1);
     int nu = GetInPortCols(block, 1);
-    unsigned long *u = Getuint32InPortPtrs(block, 1);
-    unsigned long *y = Getuint32OutPortPtrs(block, 1);
+    SCSUINT32_COP *u = Getuint32InPortPtrs(block, 1);
+    SCSUINT32_COP *y = Getuint32OutPortPtrs(block, 1);
     int *ipar = GetIparPtrs(block);
 
     for (i = 0; i < mu * nu; i++)