summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>2006-08-01 22:16:04 +0000
committerJason Wright <jason@cvs.openbsd.org>2006-08-01 22:16:04 +0000
commit76af42fb8f816847695f07c29991a2dea0f4e014 (patch)
tree06f6a8719c541803549170263a74065cc56894ff
parentb3705c08f61da6de60e22ad050283753fe86a85e (diff)
* move sys/queue.h inclusion to sysdef.h (it's system specific)
* add <signal.h> to sysdef.h (needed for sig_atomic_t on linux, and we get it by accident on OpenBSD) * remove <signal.h> from tty.c/spawn.c (not needed now that it's in sysdef.h) ok beck
-rw-r--r--usr.bin/mg/def.h4
-rw-r--r--usr.bin/mg/spawn.c3
-rw-r--r--usr.bin/mg/sysdef.h4
-rw-r--r--usr.bin/mg/tty.c3
4 files changed, 6 insertions, 8 deletions
diff --git a/usr.bin/mg/def.h b/usr.bin/mg/def.h
index d4e5016393a..e2311a1063d 100644
--- a/usr.bin/mg/def.h
+++ b/usr.bin/mg/def.h
@@ -1,9 +1,7 @@
-/* $OpenBSD: def.h,v 1.95 2006/07/25 08:27:09 kjell Exp $ */
+/* $OpenBSD: def.h,v 1.96 2006/08/01 22:16:03 jason Exp $ */
/* This file is in the public domain. */
-#include <sys/queue.h>
-
/*
* This file is the general header file for all parts
* of the Mg display editor. It contains all of the
diff --git a/usr.bin/mg/spawn.c b/usr.bin/mg/spawn.c
index f52e0ed564d..13fd9853035 100644
--- a/usr.bin/mg/spawn.c
+++ b/usr.bin/mg/spawn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spawn.c,v 1.10 2005/06/14 18:14:40 kjell Exp $ */
+/* $OpenBSD: spawn.c,v 1.11 2006/08/01 22:16:03 jason Exp $ */
/* This file is in the public domain. */
@@ -9,7 +9,6 @@
#include "def.h"
-#include <signal.h>
#include <termios.h>
#include <term.h>
diff --git a/usr.bin/mg/sysdef.h b/usr.bin/mg/sysdef.h
index d03b4ef4d8b..4df4e805a8c 100644
--- a/usr.bin/mg/sysdef.h
+++ b/usr.bin/mg/sysdef.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysdef.h,v 1.14 2006/05/03 22:19:41 kjell Exp $ */
+/* $OpenBSD: sysdef.h,v 1.15 2006/08/01 22:16:03 jason Exp $ */
/* This file is in the public domain. */
@@ -6,11 +6,13 @@
* POSIX system header file
*/
#include <sys/param.h>
+#include <sys/queue.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
+#include <signal.h>
#define KBLOCK 8192 /* Kill grow. */
#define GOOD 0 /* Good exit status. */
diff --git a/usr.bin/mg/tty.c b/usr.bin/mg/tty.c
index 42bdb28d30b..9807ea78567 100644
--- a/usr.bin/mg/tty.c
+++ b/usr.bin/mg/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.27 2006/04/03 00:40:56 deraadt Exp $ */
+/* $OpenBSD: tty.c,v 1.28 2006/08/01 22:16:03 jason Exp $ */
/* This file is in the public domain. */
@@ -34,7 +34,6 @@
#include <sys/ioctl.h>
#include <term.h>
-#include <signal.h>
static int charcost(char *);