diff options
| author | jkh <jkh@FreeBSD.org> | 1993-10-31 00:19:01 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1993-10-31 00:19:01 +0000 |
| commit | 10ecafe61ad5ec733a343a6d5293eeb3a78db9b3 (patch) | |
| tree | 812c9cd85299b4c6883ebdcc05ed0228d4c12ca0 /sys/dev/syscons | |
| parent | 7967c5b8ed634a261716017d8f52fedcadd16d74 (diff) | |
| download | FreeBSD-src-10ecafe61ad5ec733a343a6d5293eeb3a78db9b3.zip FreeBSD-src-10ecafe61ad5ec733a343a6d5293eeb3a78db9b3.tar.gz | |
Now that STAR_SAVER and SNAKE_SAVER are kernel options, add code
to make sure that bad things don't happen if both are (incorrectly)
defined at once.
Diffstat (limited to 'sys/dev/syscons')
| -rw-r--r-- | sys/dev/syscons/syscons.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index d634a7c..4e56cfc 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -35,7 +35,7 @@ * * from: @(#)pccons.c 5.11 (Berkeley) 5/21/91 * from: @(#)syscons.c 1.1 931021 - * $Id: syscons.c,v 1.16 1993/10/28 06:15:14 rgrimes Exp $ + * $Id: syscons.c,v 1.17 1993/10/31 00:09:02 jkh Exp $ * * Heavily modified by Søren Schmidt (sos@login.dkuug.dk) to provide: * @@ -1126,7 +1126,7 @@ static rand() return ((rand_next = rand_next * 1103515245 + 12345) & 0x7FFFFFFF); } #endif -#ifdef STAR_SAVER +#if defined(STAR_SAVER) && !defined(SNAKE_SAVER) /* * Alternate saver that got its inspiration from a well known utility * package for an unfamous OS. @@ -1181,7 +1181,7 @@ static void scrn_saver(int test) } } #endif -#ifdef SNAKE_SAVER +#if defined(SNAKE_SAVER) && !defined(STAR_SAVER) /* * alternative screen saver for cards that do not like blanking */ |
