diff options
| author | peter <peter@FreeBSD.org> | 1999-07-01 20:43:03 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-07-01 20:43:03 +0000 |
| commit | 22e38b45b20e68f38edb59cfdd12a4422d39c6c4 (patch) | |
| tree | 21c37d040723b876e0c2216d27ec445d3d17845c | |
| parent | b9a0f50692b3b09e0399fed082a64ce135e3a1eb (diff) | |
| download | FreeBSD-src-22e38b45b20e68f38edb59cfdd12a4422d39c6c4.zip FreeBSD-src-22e38b45b20e68f38edb59cfdd12a4422d39c6c4.tar.gz | |
Tidy up a few warnings when used without splash. (things defined but not
used)
| -rw-r--r-- | sys/dev/syscons/syscons.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index ed5483c..4859076 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.310 1999/06/29 17:30:33 yokota Exp $ + * $Id: syscons.c,v 1.311 1999/07/01 20:29:25 peter Exp $ */ #include "sc.h" @@ -101,11 +101,13 @@ static char sc_malloc = FALSE; static int saver_mode = CONS_LKM_SAVER; /* LKM/user saver */ static int run_scrn_saver = FALSE; /* should run the saver? */ static long scrn_blank_time = 0; /* screen saver timeout value */ +#if NSPLASH > 0 static int scrn_blanked; /* # of blanked screen */ static int sticky_splash = FALSE; static void none_saver(sc_softc_t *sc, int blank) { } static void (*current_saver)(sc_softc_t *, int) = none_saver; +#endif #if !defined(SC_NO_FONT_LOADING) && defined(SC_DFLT_FONT) #include "font.h" @@ -2942,9 +2944,11 @@ ansi_put(scr_stat *scp, u_char *buf, int len) { u_char *ptr = buf; +#if NSPLASH > 0 /* make screensaver happy */ if (!sticky_splash && scp == scp->sc->cur_scp) run_scrn_saver = FALSE; +#endif outloop: scp->sc->write_in_progress++; @@ -3426,7 +3430,9 @@ scshutdown(int howto, void *arg) int sc_clean_up(scr_stat *scp) { +#if NSPLASH > 0 int error; +#endif /* NSPLASH */ sc_touch_scrn_saver(); #if NSPLASH > 0 |
