--- a/lib/libfec.c +++ b/lib/libfec.c @@ -61,8 +61,6 @@ struct timeval { }; #define gettimeofday(x, dummy) { (x)->ticks = clock() ; } #define DIFF_T(a,b) (1+ 1000000*(a.ticks - b.ticks) / CLOCKS_PER_SEC ) -typedef unsigned long u_long ; -typedef unsigned short u_short ; #else /* typically, unix systems */ #include #define DIFF_T(a,b) \ @@ -75,12 +73,12 @@ typedef unsigned short u_short ; t = x.tv_usec + 1000000* (x.tv_sec & 0xff ) ; \ } #define TOCK(t) \ - { u_long t1 ; TICK(t1) ; \ + { unsigned long t1 ; TICK(t1) ; \ if (t1 < t) t = 256000000 + t1 - t ; \ else t = t1 - t ; \ if (t == 0) t = 1 ;} -u_long ticks[10]; /* vars for timekeeping */ +unsigned long ticks[10]; /* vars for timekeeping */ #else #define DEB(x) #define DDB(x) @@ -625,7 +623,7 @@ init_fec(void) #define FEC_MAGIC 0xFECC0DEC struct fec_parms { - u_long magic ; + unsigned long magic ; int k, n ; /* parameters of the code */ gf *enc_matrix ; } ;