summaryrefslogtreecommitdiffstats
path: root/match.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2019-03-30 22:09:46 -0700
committerKaz Kylheku <kaz@kylheku.com>2019-03-30 22:09:46 -0700
commit9e464a4cc18c5ca8ccdc6ac30e082b8d6b315d67 (patch)
treea29f239ef4d06d4385495d5b1f21388993898008 /match.c
parent06021c4b490ff237bf7ef13ab0f7bce0e5ef11be (diff)
downloadtxr-9e464a4cc18c5ca8ccdc6ac30e082b8d6b315d67.tar.gz
txr-9e464a4cc18c5ca8ccdc6ac30e082b8d6b315d67.tar.bz2
txr-9e464a4cc18c5ca8ccdc6ac30e082b8d6b315d67.zip
c++ maintenance: multiple defs of mod_s and bit_s.
* arith.h (mod_s, bit_s): Add extern declarations. * ffi.c (bit_s): Remove definition. * match.c (mod_s): Remove definition. Include "arith.h" to obtain declaration of mod_s.
Diffstat (limited to 'match.c')
-rw-r--r--match.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/match.c b/match.c
index d36525b1..b2f38d19 100644
--- a/match.c
+++ b/match.c
@@ -48,6 +48,7 @@
#include "debug.h"
#include "eval.h"
#include "cadr.h"
+#include "arith.h"
#include "match.h"
int opt_print_bindings = 0;
@@ -57,7 +58,7 @@ int opt_arraydims = 1;
val decline_k, next_spec_k, repeat_spec_k;
val mingap_k, maxgap_k, gap_k, mintimes_k, maxtimes_k, times_k;
val lines_k, chars_k;
-val text_s, choose_s, gather_s, do_s, mdo_s, mod_s, modlast_s;
+val text_s, choose_s, gather_s, do_s, mdo_s, modlast_s; /* mod_s in arith.c */
val line_s, data_s, fuzz_s, load_s;
val include_s, close_s, require_s, in_package_s;
val else_s, elif_s;