From a412026cdc66c6a082026d8fbc87f4a7ee111cd8 Mon Sep 17 00:00:00 2001
From: Greg Stark <stark@mit.edu>
Date: Fri, 28 Apr 2017 00:30:25 +0100
Subject: [PATCH] Fix two bugs gcc warnings pointed out

---
 conjunction.c | 2 +-
 function.h    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conjunction.c b/conjunction.c
index f2b3fab..4d16926 100644
--- a/conjunction.c
+++ b/conjunction.c
@@ -8,7 +8,7 @@ DYAD(amper) { V *v; A z; I xt = AT(x), yt = AT(y);
         v = VAV(xt&VERB ? x : y);
         z = CDERV(CAMPR, bond, bond2, x, y, VLR(v), VMR(v), VRR(v));
     }
-    else if (xt&VERB && yt&&VERB) {
+    else if (xt&VERB && yt&VERB) {
         v = VAV(y);
         z = CDERV(CAMPR, compose, compose2, x, y, VLR(v), VMR(v), VRR(v));
     }
diff --git a/function.h b/function.h
index a341ccd..771af4a 100644
--- a/function.h
+++ b/function.h
@@ -1,5 +1,5 @@
 #ifndef _FUNCTION_H
-#define _FUNCITON_H
+#define _FUNCTION_H
 
 typedef struct _verb {
     AF1 f1;