From 9afdb1976e58be1f56957ad90cb58a50ce41546e Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Sun, 31 Oct 1993 00:19:01 +0000 Subject: [PATCH] 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. --- sys/dev/syscons/syscons.c | 6 +++--- sys/i386/isa/syscons.c | 6 +++--- sys/isa/syscons.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index d634a7c861d0..4e56cfc20dbf 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 */ diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index d634a7c861d0..4e56cfc20dbf 100644 --- a/sys/i386/isa/syscons.c +++ b/sys/i386/isa/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 */ diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c index d634a7c861d0..4e56cfc20dbf 100644 --- a/sys/isa/syscons.c +++ b/sys/isa/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 */