From 630089ded6e87135484b7d86dcd0383926cfe93e Mon Sep 17 00:00:00 2001
From: Mark Borgerding <mark@borgerding.net>
Date: Mon, 29 Dec 2003 16:46:27 +0000
Subject: [PATCH] kfc works

---
 test/Makefile   | 9 +++++----
 test/compfft.py | 4 ++--
 tools/Makefile  | 9 +++++----
 tools/kfc.c     | 2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index c4087f3..aaa1869 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -13,7 +13,7 @@ BENCHKISS=bm_kiss_$(DATATYPE)
 BENCHFFTW=bm_fftw_$(DATATYPE)
 SELFTEST=st_$(DATATYPE)
 TESTREAL=tr_$(DATATYPE)
-TESTKFC=tc_$(DATATYPE)
+TESTKFC=tkfc_$(DATATYPE)
 FFTUTIL=kf_$(DATATYPE)
 
 ifeq  "$(DATATYPE)" "short"
@@ -44,8 +44,9 @@ $(FFTUTIL): ../kiss_fft.c fftutil.c kiss_fft2d.c kiss_fftr.c
 $(SELFTEST): ../kiss_fft.c $(SELFTESTSRC)
 	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -lm $+
 
-$(TESTKFC): ../kiss_fft.c kiss_fftr.c test_real.c
-	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -lm $+
+$(TESTKFC): ../kiss_fft.c kfc.c
+	$(CC) -o $@ $(CFLAGS) -I.. -DKFC_TEST $(TYPEFLAGS) -lm $+
+	
 $(TESTREAL): ../kiss_fft.c kiss_fftr.c test_real.c
 	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -lm $+
 
@@ -76,4 +77,4 @@ selftest_short.c:
 	./mk_test.py -s 10 12 14 > selftest_short.c
 
 clean:
-	rm -f *~ bm_* st_* tr_* kf_*
+	rm -f *~ bm_* st_* tr_* kf_* tkfc_*
diff --git a/test/compfft.py b/test/compfft.py
index 2811795..ae7eb00 100755
--- a/test/compfft.py
+++ b/test/compfft.py
@@ -36,8 +36,8 @@ def main():
         usage: compfft.py 
         -n nfft
         -u utilname : see sample_code/fftutil.c
-        -R : real-optimized version
-        """)
+        -R : real-optimized version\n""")
+        sys.exit(1)
 
     x = randbuf(n,cpx)
 
diff --git a/tools/Makefile b/tools/Makefile
index c4087f3..aaa1869 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -13,7 +13,7 @@ BENCHKISS=bm_kiss_$(DATATYPE)
 BENCHFFTW=bm_fftw_$(DATATYPE)
 SELFTEST=st_$(DATATYPE)
 TESTREAL=tr_$(DATATYPE)
-TESTKFC=tc_$(DATATYPE)
+TESTKFC=tkfc_$(DATATYPE)
 FFTUTIL=kf_$(DATATYPE)
 
 ifeq  "$(DATATYPE)" "short"
@@ -44,8 +44,9 @@ $(FFTUTIL): ../kiss_fft.c fftutil.c kiss_fft2d.c kiss_fftr.c
 $(SELFTEST): ../kiss_fft.c $(SELFTESTSRC)
 	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -lm $+
 
-$(TESTKFC): ../kiss_fft.c kiss_fftr.c test_real.c
-	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -lm $+
+$(TESTKFC): ../kiss_fft.c kfc.c
+	$(CC) -o $@ $(CFLAGS) -I.. -DKFC_TEST $(TYPEFLAGS) -lm $+
+	
 $(TESTREAL): ../kiss_fft.c kiss_fftr.c test_real.c
 	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -lm $+
 
@@ -76,4 +77,4 @@ selftest_short.c:
 	./mk_test.py -s 10 12 14 > selftest_short.c
 
 clean:
-	rm -f *~ bm_* st_* tr_* kf_*
+	rm -f *~ bm_* st_* tr_* kf_* tkfc_*
diff --git a/tools/kfc.c b/tools/kfc.c
index a044efd..fbce7e9 100644
--- a/tools/kfc.c
+++ b/tools/kfc.c
@@ -4,7 +4,7 @@ typedef struct
 {
     int nfft;
     int inverse;
-    const void * cfg;
+    void * cfg;
     void * next;
 } cached_fft;