Move cwm_status around to avoid header fu, and remove extraneous signal

header from xevents.c; noticed by Christian Neukirchen.

3 files changed, 5 insertions, 5 deletions

diff --git a/calmwm.h b/calmwm.h
index 726f463..b479503 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: calmwm.h,v 1.252 2014/01/30 14:40:21 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.253 2014/01/30 15:41:11 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -327,7 +327,6 @@ extern struct client_ctx_q		 Clientq;
 extern struct conf			 Conf;
 extern const char			*homedir;
 extern int				 HasRandr, Randr_ev;
-extern volatile sig_atomic_t		 cwm_status;
 
 enum {
 	WM_STATE,
diff --git a/kbfunc.c b/kbfunc.c
index c9c39d4..c7b48be 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: kbfunc.c,v 1.94 2014/01/29 22:30:00 okan Exp $
+ * $OpenBSD: kbfunc.c,v 1.95 2014/01/30 15:41:11 okan Exp $
  */
 
 #include <sys/param.h>
@@ -35,6 +35,8 @@
 
 #define HASH_MARKER	"|1|"
 
+extern sig_atomic_t	 cwm_status;
+
 void
 kbfunc_client_lower(struct client_ctx *cc, union arg *arg)
 {
diff --git a/xevents.c b/xevents.c
index 4a4532f..f2b520f 100644
--- a/xevents.c
+++ b/xevents.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: xevents.c,v 1.108 2014/01/29 21:13:52 okan Exp $
+ * $OpenBSD: xevents.c,v 1.109 2014/01/30 15:41:11 okan Exp $
  */
 
 /*
@@ -29,7 +29,6 @@
 
 #include <err.h>
 #include <errno.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>