From 3e47c889a4fbdd4f5911df31e1f53144ddfebb05 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 29 Mar 2017 23:31:37 -0700
Subject: [PATCH] Fix bugs: typos caught by the macos compiler.

---
 src/microcode/uxsig.c   | 4 ++--
 src/microcode/x11base.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/microcode/uxsig.c b/src/microcode/uxsig.c
index bb9d1ceba..284663d08 100644
--- a/src/microcode/uxsig.c
+++ b/src/microcode/uxsig.c
@@ -305,12 +305,12 @@ find_signal_name (int signo)
 }
 
 void
-foreach_async_signal (void(*func)(int signo))
+foreach_async_signal (void (*func) (int signo))
 {
   struct signal_descriptor * scan = signal_descriptors;
   struct signal_descriptor * end = (scan + signal_descriptors_length);
   for (; (scan < end); scan += 1)
-    if ((scan -> flags) && ASYNC)
+    if ((scan -> flags) & ASYNC)
       func (scan -> signo);
 }
 
diff --git a/src/microcode/x11base.c b/src/microcode/x11base.c
index c63e0b071..d91306cad 100644
--- a/src/microcode/x11base.c
+++ b/src/microcode/x11base.c
@@ -1161,8 +1161,8 @@ key_event (struct xwindow * xw, XKeyEvent * event, enum event_type type)
 
   /* Make ShiftLock modifier not affect keys with other modifiers. */
   if ((event->state)
-      & (ShiftMask || ControlMask
-	 || Mod1Mask || Mod2Mask || Mod3Mask || Mod4Mask || Mod5Mask))
+      & (ShiftMask | ControlMask
+	 | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask))
     {
       if (((event->state) & LockMask) != 0)
 	(event->state) &=~ LockMask;
-- 
2.25.1