summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormestre <mestre@openbsd.org>2015-12-31 18:10:19 +0000
committermestre <mestre@openbsd.org>2015-12-31 18:10:19 +0000
commitf741f25ef30a4834223f00974b0b6ab609ba4fdd (patch)
tree534ce2370be04d4d7f11573cf25308c22b1c49ef
parentRemove use of sysexits.h; OK espie@ (diff)
downloadwireguard-openbsd-f741f25ef30a4834223f00974b0b6ab609ba4fdd.tar.xz
wireguard-openbsd-f741f25ef30a4834223f00974b0b6ab609ba4fdd.zip
Include only needed header files per each source file
This one was also OK'ed by tb@
-rw-r--r--games/cribbage/cards.c7
-rw-r--r--games/cribbage/crib.c7
-rw-r--r--games/cribbage/cribbage.h7
-rw-r--r--games/cribbage/deck.h3
-rw-r--r--games/cribbage/extern.c3
-rw-r--r--games/cribbage/instr.c9
-rw-r--r--games/cribbage/io.c6
-rw-r--r--games/cribbage/score.c5
-rw-r--r--games/cribbage/support.c4
9 files changed, 14 insertions, 37 deletions
diff --git a/games/cribbage/cards.c b/games/cribbage/cards.c
index 26aae894600..713dcfb164c 100644
--- a/games/cribbage/cards.c
+++ b/games/cribbage/cards.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cards.c,v 1.6 2013/10/25 18:31:29 millert Exp $ */
+/* $OpenBSD: cards.c,v 1.7 2015/12/31 18:10:19 mestre Exp $ */
/* $NetBSD: cards.c,v 1.3 1995/03/21 15:08:41 cgd Exp $ */
/*-
@@ -30,15 +30,10 @@
* SUCH DAMAGE.
*/
-#include <curses.h>
-#include <stdio.h>
#include <stdlib.h>
-#include <time.h>
-#include "deck.h"
#include "cribbage.h"
-
/*
* Initialize a deck of cards to contain one of each type.
*/
diff --git a/games/cribbage/crib.c b/games/cribbage/crib.c
index 929b1cd8162..f4db45e8b63 100644
--- a/games/cribbage/crib.c
+++ b/games/cribbage/crib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crib.c,v 1.20 2015/12/18 18:47:56 tb Exp $ */
+/* $OpenBSD: crib.c,v 1.21 2015/12/31 18:10:19 mestre Exp $ */
/* $NetBSD: crib.c,v 1.7 1997/07/10 06:47:29 mikel Exp $ */
/*-
@@ -30,18 +30,13 @@
* SUCH DAMAGE.
*/
-#include <sys/types.h>
-#include <curses.h>
#include <err.h>
#include <signal.h>
#include <stdlib.h>
-#include <string.h>
#include <unistd.h>
-#include "deck.h"
#include "cribbage.h"
#include "cribcur.h"
-#include "pathnames.h"
int
main(int argc, char *argv[])
diff --git a/games/cribbage/cribbage.h b/games/cribbage/cribbage.h
index c6db9cf7288..fad3be1fa98 100644
--- a/games/cribbage/cribbage.h
+++ b/games/cribbage/cribbage.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cribbage.h,v 1.11 2015/12/26 00:26:39 mestre Exp $ */
+/* $OpenBSD: cribbage.h,v 1.12 2015/12/31 18:10:19 mestre Exp $ */
/* $NetBSD: cribbage.h,v 1.3 1995/03/21 15:08:46 cgd Exp $ */
/*
@@ -32,6 +32,11 @@
* @(#)cribbage.h 8.1 (Berkeley) 5/31/93
*/
+#include <curses.h>
+#include <stdbool.h>
+
+#include "deck.h"
+
extern CARD deck[ CARDS ]; /* a deck */
extern CARD phand[ FULLHAND ]; /* player's hand */
extern CARD chand[ FULLHAND ]; /* computer's hand */
diff --git a/games/cribbage/deck.h b/games/cribbage/deck.h
index f8521f5523e..3a6a4a3e221 100644
--- a/games/cribbage/deck.h
+++ b/games/cribbage/deck.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: deck.h,v 1.3 2003/06/03 03:01:39 millert Exp $ */
+/* $OpenBSD: deck.h,v 1.4 2015/12/31 18:10:19 mestre Exp $ */
/* $NetBSD: deck.h,v 1.3 1995/03/21 15:08:49 cgd Exp $ */
/*
@@ -36,7 +36,6 @@
* define structure of a deck of cards and other related things
*/
-
#define CARDS 52 /* number cards in deck */
#define RANKS 13 /* number ranks in deck */
#define SUITS 4 /* number suits in deck */
diff --git a/games/cribbage/extern.c b/games/cribbage/extern.c
index 7ad135637d5..d736ffd5e8b 100644
--- a/games/cribbage/extern.c
+++ b/games/cribbage/extern.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.c,v 1.7 2009/10/27 23:59:24 deraadt Exp $ */
+/* $OpenBSD: extern.c,v 1.8 2015/12/31 18:10:20 mestre Exp $ */
/* $NetBSD: extern.c,v 1.3 1995/03/21 15:08:50 cgd Exp $ */
/*-
@@ -33,7 +33,6 @@
#include <curses.h>
#include "deck.h"
-#include "cribbage.h"
bool explain = FALSE; /* player mistakes explained */
bool iwon = FALSE; /* if comp won last game */
diff --git a/games/cribbage/instr.c b/games/cribbage/instr.c
index b2644739b40..d4abfe52af2 100644
--- a/games/cribbage/instr.c
+++ b/games/cribbage/instr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: instr.c,v 1.12 2015/11/29 14:42:36 tb Exp $ */
+/* $OpenBSD: instr.c,v 1.13 2015/12/31 18:10:20 mestre Exp $ */
/* $NetBSD: instr.c,v 1.5 1997/07/10 06:47:30 mikel Exp $ */
/*-
@@ -30,22 +30,15 @@
* SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/wait.h>
-#include <sys/stat.h>
-#include <curses.h>
#include <err.h>
#include <errno.h>
#include <fcntl.h>
#include <paths.h>
-#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
#include <unistd.h>
-#include "deck.h"
-#include "cribbage.h"
#include "pathnames.h"
void
diff --git a/games/cribbage/io.c b/games/cribbage/io.c
index 40ea3e494bd..37a8b53b160 100644
--- a/games/cribbage/io.c
+++ b/games/cribbage/io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: io.c,v 1.20 2015/10/24 18:04:06 mmcc Exp $ */
+/* $OpenBSD: io.c,v 1.21 2015/12/31 18:10:20 mestre Exp $ */
/* $NetBSD: io.c,v 1.9 1997/07/09 06:25:47 phil Exp $ */
/*-
@@ -31,15 +31,11 @@
*/
#include <ctype.h>
-#include <curses.h>
#include <signal.h>
#include <stdlib.h>
#include <string.h>
-#include <termios.h>
#include <unistd.h>
-#include <stdarg.h>
-#include "deck.h"
#include "cribbage.h"
#include "cribcur.h"
diff --git a/games/cribbage/score.c b/games/cribbage/score.c
index a5a1b32b229..54c223f0fbb 100644
--- a/games/cribbage/score.c
+++ b/games/cribbage/score.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: score.c,v 1.10 2014/05/08 23:12:40 schwarze Exp $ */
+/* $OpenBSD: score.c,v 1.11 2015/12/31 18:10:20 mestre Exp $ */
/* $NetBSD: score.c,v 1.3 1995/03/21 15:08:57 cgd Exp $ */
/*-
@@ -30,12 +30,9 @@
* SUCH DAMAGE.
*/
-#include <curses.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "deck.h"
#include "cribbage.h"
/*
diff --git a/games/cribbage/support.c b/games/cribbage/support.c
index 2bd8a5851b0..4058c15e748 100644
--- a/games/cribbage/support.c
+++ b/games/cribbage/support.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: support.c,v 1.12 2010/11/03 12:51:10 dcoppa Exp $ */
+/* $OpenBSD: support.c,v 1.13 2015/12/31 18:10:20 mestre Exp $ */
/* $NetBSD: support.c,v 1.3 1995/03/21 15:08:59 cgd Exp $ */
/*-
@@ -30,11 +30,9 @@
* SUCH DAMAGE.
*/
-#include <curses.h>
#include <err.h>
#include <string.h>
-#include "deck.h"
#include "cribbage.h"
#include "cribcur.h"