--- rscw.c.orig	2003-07-08 00:37:30.000000000 -0500
+++ rscw.c	2003-07-08 00:37:21.000000000 -0500
@@ -13,7 +13,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
-#include <rfftw.h>
+#include <fftw3.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -119,9 +119,9 @@
 
 double search_carrier(int bri, int num)
 {
-   rfftw_plan plan;
-   fftw_real *in;
-   fftw_real *out;
+   fftw_plan plan;
+   double *in;
+   double *out;
    int i,iargmax=0;
    int imin,imax;
    double a,max;
@@ -131,15 +131,15 @@
    int dcd;
 
    /* prepare the FFT library */
-   plan = rfftw_create_plan(num, FFTW_REAL_TO_COMPLEX, FFTW_ESTIMATE);
-   in = malloc(num*sizeof(fftw_real));
-   out = malloc(num*sizeof(fftw_real));
+   in = fftw_malloc(num*sizeof(double));
+   out = fftw_malloc(num*sizeof(double));
+   plan = fftw_plan_r2r_1d( num, in, out, FFTW_R2HC, FFTW_ESTIMATE );
 
    /* apply a simple triangular windowing function */
    for (i=0; i<num/2; i++) in[i]=br[(bri+i)&BRMASK]*((i+1)/(num/2.0));
    for (i=num/2; i<num; i++) in[i]=br[(bri+i)&BRMASK]*((num-i)/(num/2.0));
    /* perform the fft */
-   rfftw_one(plan, in, out);
+   fftw_execute( plan );
    /* calculate the magnitude at each frequency */
    for (i=1; i<num/2-1; i++) {
       a = out[i]*out[i]+out[num-i]*out[num-i];
@@ -183,9 +183,9 @@
 
    if (xpipe) fprintf(xpipe,"F2 %g\n", f);
 
-   rfftw_destroy_plan(plan);
-   free(in);
-   free(out);
+   fftw_destroy_plan(plan);
+   fftw_free(in);
+   fftw_free(out);
 
    return f;
 }