From 4ce208159b4425f0af910630e74940fb0b8747b4 Mon Sep 17 00:00:00 2001
From: "N.N." <matju@users.sourceforge.net>
Date: Sat, 31 Dec 2005 19:31:09 +0000
Subject: fixed int vs t_int

svn path=/trunk/externals/creb/; revision=4334
---
 modules/bdiag.c  | 1 +
 modules/diag.c   | 1 +
 modules/dwt.c    | 6 +++---
 modules/fdn.c    | 2 +-
 modules/ffpoly.c | 4 ++--
 modules/permut.c | 6 +++---
 6 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'modules')

diff --git a/modules/bdiag.c b/modules/bdiag.c
index d1772ce..45dc0d9 100644
--- a/modules/bdiag.c
+++ b/modules/bdiag.c
@@ -26,6 +26,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include "extlib_util.h"
 
 #define MAXORDER 64
 
diff --git a/modules/diag.c b/modules/diag.c
index cf7f5cc..d4f273d 100644
--- a/modules/diag.c
+++ b/modules/diag.c
@@ -26,6 +26,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include "extlib_util.h"
 
 #define MAXORDER 64
 
diff --git a/modules/dwt.c b/modules/dwt.c
index caa75ff..327732c 100644
--- a/modules/dwt.c
+++ b/modules/dwt.c
@@ -190,9 +190,9 @@ static void dwt_permutation(t_dwt *x, t_int n){
 
   /* debug */
   for(k=0; k<n; k++)
-    printf("clutter[%d] = %d\n", k, ctl->c_clutter[k]);
+    printf("clutter[%ld] = %ld\n", k, ctl->c_clutter[k]);
   for(k=0; k<n; k++)
-    printf("unclutter[%d] = %d\n", k, ctl->c_unclutter[k]);
+    printf("unclutter[%ld] = %ld\n", k, ctl->c_unclutter[k]);
 
   exit(1);
 }
@@ -234,7 +234,7 @@ static void dwt_filter(t_dwt *x,  t_symbol *s, int argc, t_atom *argv)
   float *ufilter = x->x_ctl.c_update; 
   float *mask = NULL;
 
-  int *length = NULL;
+  t_int *length = NULL;
   float sum = 0;
 
   if (s == gensym("predict"))
diff --git a/modules/fdn.c b/modules/fdn.c
index d9e7ef6..20bbaae 100644
--- a/modules/fdn.c
+++ b/modules/fdn.c
@@ -326,7 +326,7 @@ static void fdn_setupdelayline(t_fdn *x){
   int sum, t, n;
   int mask = x->x_ctl.c_bufsize - 1;
   int start =  x->x_ctl.c_tap[0];
-  int *tap = x->x_ctl.c_tap;
+  t_int *tap = x->x_ctl.c_tap;
   float *length = x->x_ctl.c_length;
   float scale = sys_getsr() * .001f;
 
diff --git a/modules/ffpoly.c b/modules/ffpoly.c
index 023f29d..c325969 100644
--- a/modules/ffpoly.c
+++ b/modules/ffpoly.c
@@ -49,7 +49,7 @@ static void ffpoly_compute(t_ffpoly *x, t_floatarg fcoef)
     int in = (int)fcoef;
     int fo = x->x_field_order;
     int po = x->x_poly_order;
-    int* c = x->x_coef;
+    t_int* c = x->x_coef;
     int i, out;
 
     in %= fo;
@@ -135,7 +135,7 @@ static void *ffpoly_new(t_floatarg fpolyorder, t_floatarg ffieldorder)
     x->x_poly_order = polyorder;
     x->x_field_order = fieldorder;
 
-    x->x_coef = (int *)malloc((x->x_poly_order  + 1) * sizeof(int));
+    x->x_coef = (t_int *)malloc((x->x_poly_order  + 1) * sizeof(int));
 
     /* set poly to f(x) = x */
     ffpoly_coefficients(x, x->x_field_order);
diff --git a/modules/permut.c b/modules/permut.c
index e25d0cd..22da5dd 100644
--- a/modules/permut.c
+++ b/modules/permut.c
@@ -27,7 +27,7 @@
 typedef struct permutctl
 {
   char c_type;
-  int *c_permutationtable;
+  t_int *c_permutationtable;
   int c_blocksize;
 } t_permutctl;
 
@@ -59,7 +59,7 @@ static void permut_random(t_permut *x, t_floatarg seed)
   int i,j;
   int N = x->x_ctl.c_blocksize;
   int mask = N-1;
-  int *p = x->x_ctl.c_permutationtable;
+  t_int *p = x->x_ctl.c_permutationtable;
   int r, last = 0;
 
   //srand(* ((unsigned int *)(&seed)));
@@ -100,7 +100,7 @@ static void permut_resize_table(t_permut *x, int size)
     {
       if (x->x_ctl.c_permutationtable)
 	free(x->x_ctl.c_permutationtable);
-      x->x_ctl.c_permutationtable = (int *)malloc(sizeof(int)*size);
+      x->x_ctl.c_permutationtable = (t_int *)malloc(sizeof(int)*size);
       x->x_ctl.c_blocksize = size;
 
       /* make sure it's initialized */
-- 
cgit v1.2.1