diff options
| author | Rob Savoye <rob@welcomehome.org> | 2010-11-28 19:07:27 -0700 |
|---|---|---|
| committer | Rob Savoye <rob@welcomehome.org> | 2010-11-28 19:07:27 -0700 |
| commit | f65e80377e43de3635bf1ced46005ba7e6e8a1a5 (patch) | |
| tree | f7d3fb4621583ed61d8176f540d4c5b5fb9ececf | |
| parent | 35a0021f1a77824d6b15d5efa04c28bdc1ed13a9 (diff) | |
rename the test case to use C inetead of C++
| -rw-r--r-- | gr-run-waveform/Makefile.am | 2 | ||||
| -rw-r--r-- | gr-run-waveform/test_waveform.c (renamed from gr-run-waveform/test_waveform.cc) | 15 |
2 files changed, 4 insertions, 13 deletions
diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index 2098a0396b..74d2153cfe 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -47,7 +47,7 @@ test_xyzzy_CPPFLAGS = $(GUILE_CFLAGS) \ test_xyzzy_LDADD = $(GUILE_LIBS) test_xyzzy_DEPENDENCIES = $(BUILT_SOURCES) -test_waveform_SOURCES = test_waveform.cc xyzzy.cc xyzzy-load.c +test_waveform_SOURCES = test_waveform.c xyzzy.cc xyzzy-load.c test_waveform_CPPFLAGS = $(GUILE_CFLAGS) \ -DSRCDIR=\"$(srcdir)\" \ -DDATAROOTDIR=\"$(datarootdir)\" diff --git a/gr-run-waveform/test_waveform.cc b/gr-run-waveform/test_waveform.c index 443a0673b1..b995861223 100644 --- a/gr-run-waveform/test_waveform.cc +++ b/gr-run-waveform/test_waveform.c @@ -20,25 +20,16 @@ * Boston, MA 02110-1301, USA. */ -#include <cstdio> -#include <cstdlib> -#include <string> -#include <iostream> -#include <fstream> +#include <stdio.h> +#include <stdlib.h> #include <libguile.h> -using namespace std; - #include "xyzzy.h" -extern "C" { -extern SCM scm_xyzzy_search_path (SCM path, SCM filename, SCM extensions); -} - static void inner_main (void *data, int argc, char **argv) { - scm_c_define_gsubr ("xyzzy_search_path", 2, 1, 0, (SCM (*)()) scm_xyzzy_search_path); + scm_xyzzy_init(); scm_shell (argc, argv); } |