diff options
author | peter <peter@FreeBSD.org> | 2000-01-29 15:08:56 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2000-01-29 15:08:56 +0000 |
commit | d7e5eb3faac173e7d9640e098621746b86213739 (patch) | |
tree | 9a2474b2f7c68ec2b1e97af2ab3b083c722e9ad7 /sys/dev/syscons | |
parent | e06faf1d941fbd0cfd397f781f3986049ecce128 (diff) | |
download | FreeBSD-src-d7e5eb3faac173e7d9640e098621746b86213739.zip FreeBSD-src-d7e5eb3faac173e7d9640e098621746b86213739.tar.gz |
Use config's conditional compilation rather than using #ifdefs that make
modular compilation harder. I'm doing this because people seem to like
cut/pasting examples of bad practices in existing code.
Diffstat (limited to 'sys/dev/syscons')
-rw-r--r-- | sys/dev/syscons/scgfbrndr.c | 6 | ||||
-rw-r--r-- | sys/dev/syscons/schistory.c | 4 | ||||
-rw-r--r-- | sys/dev/syscons/scmouse.c | 5 | ||||
-rw-r--r-- | sys/dev/syscons/scterm-dumb.c | 5 | ||||
-rw-r--r-- | sys/dev/syscons/scterm-sc.c | 5 | ||||
-rw-r--r-- | sys/dev/syscons/scterm.c | 5 | ||||
-rw-r--r-- | sys/dev/syscons/scvesactl.c | 12 | ||||
-rw-r--r-- | sys/dev/syscons/scvgarndr.c | 6 | ||||
-rw-r--r-- | sys/dev/syscons/scvidctl.c | 5 | ||||
-rw-r--r-- | sys/dev/syscons/scvtb.c | 5 | ||||
-rw-r--r-- | sys/dev/syscons/syscons.c | 4 | ||||
-rw-r--r-- | sys/dev/syscons/sysmouse.c | 5 |
12 files changed, 2 insertions, 65 deletions
diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c index afdd073..402a094 100644 --- a/sys/dev/syscons/scgfbrndr.c +++ b/sys/dev/syscons/scgfbrndr.c @@ -26,13 +26,9 @@ * $FreeBSD$ */ -#include "sc.h" -#include "vga.h" #include "opt_syscons.h" #include "opt_vga.h" -#if NSC > 0 && NVGA > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -826,5 +822,3 @@ vga_grborder(scr_stat *scp, int color) } #endif - -#endif /* NSC > 0 && NVGA > 0 */ diff --git a/sys/dev/syscons/schistory.c b/sys/dev/syscons/schistory.c index 49fc6ea..c405349 100644 --- a/sys/dev/syscons/schistory.c +++ b/sys/dev/syscons/schistory.c @@ -32,8 +32,6 @@ #include "sc.h" #include "opt_syscons.h" -#if NSC > 0 - #ifndef SC_NO_HISTORY #include <sys/param.h> @@ -307,5 +305,3 @@ sc_hist_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, } #endif /* SC_NO_HISTORY */ - -#endif /* NSC */ diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c index f75df0d..509eb35 100644 --- a/sys/dev/syscons/scmouse.c +++ b/sys/dev/syscons/scmouse.c @@ -26,11 +26,8 @@ * $FreeBSD$ */ -#include "sc.h" #include "opt_syscons.h" -#if NSC > 0 - #include <limits.h> #include <sys/param.h> #include <sys/systm.h> @@ -902,5 +899,3 @@ sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, } #endif /* SC_NO_SYSMOUSE */ - -#endif /* NSC */ diff --git a/sys/dev/syscons/scterm-dumb.c b/sys/dev/syscons/scterm-dumb.c index 19e421d..e758718 100644 --- a/sys/dev/syscons/scterm-dumb.c +++ b/sys/dev/syscons/scterm-dumb.c @@ -26,11 +26,8 @@ * $FreeBSD$ */ -#include "sc.h" #include "opt_syscons.h" -#if NSC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -152,5 +149,3 @@ dumb_nop(void) } #endif /* SC_DUMB_TERMINAL */ - -#endif /* NSC > 1 */ diff --git a/sys/dev/syscons/scterm-sc.c b/sys/dev/syscons/scterm-sc.c index 317f7da..f11cd27 100644 --- a/sys/dev/syscons/scterm-sc.c +++ b/sys/dev/syscons/scterm-sc.c @@ -27,11 +27,8 @@ * $FreeBSD$ */ -#include "sc.h" #include "opt_syscons.h" -#if NSC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -725,5 +722,3 @@ mask2attr(term_stat *tcp) } #endif /* SC_DUMB_TERMINAL */ - -#endif /* NSC > 0 */ diff --git a/sys/dev/syscons/scterm.c b/sys/dev/syscons/scterm.c index c635993..99fad98 100644 --- a/sys/dev/syscons/scterm.c +++ b/sys/dev/syscons/scterm.c @@ -26,11 +26,8 @@ * $FreeBSD$ */ -#include "sc.h" #include "opt_syscons.h" -#if NSC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -124,5 +121,3 @@ sc_term_sw_t return NULL; } - -#endif /* NSC > 0 */ diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c index 9749cc2..8c498f9 100644 --- a/sys/dev/syscons/scvesactl.c +++ b/sys/dev/syscons/scvesactl.c @@ -26,17 +26,9 @@ * $FreeBSD$ */ -#include "sc.h" -#include "vga.h" -#include "opt_syscons.h" #include "opt_vga.h" -#include "opt_vesa.h" -#ifdef VGA_NO_MODE_CHANGE -#undef VESA -#endif - -#if (NSC > 0 && NVGA > 0 && defined(VESA)) || defined(KLD_MODULE) +#ifndef VGA_NO_MODE_CHANGE #include <sys/param.h> #include <sys/systm.h> @@ -138,4 +130,4 @@ vesa_unload_ioctl(void) return 0; } -#endif /* (NSC > 0 && NVGA > 0 && VESA) || KLD_MODULE */ +#endif /* SC_NO_MODE_CHANGE */ diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c index afdd073..402a094 100644 --- a/sys/dev/syscons/scvgarndr.c +++ b/sys/dev/syscons/scvgarndr.c @@ -26,13 +26,9 @@ * $FreeBSD$ */ -#include "sc.h" -#include "vga.h" #include "opt_syscons.h" #include "opt_vga.h" -#if NSC > 0 && NVGA > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -826,5 +822,3 @@ vga_grborder(scr_stat *scp, int color) } #endif - -#endif /* NSC > 0 && NVGA > 0 */ diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c index 686a3c4..c9260a7 100644 --- a/sys/dev/syscons/scvidctl.c +++ b/sys/dev/syscons/scvidctl.c @@ -26,11 +26,8 @@ * $FreeBSD$ */ -#include "sc.h" #include "opt_syscons.h" -#if NSC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> @@ -814,5 +811,3 @@ sc_rndr_sw_t return NULL; } - -#endif /* NSC > 0 */ diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c index aac9024..dc5155b 100644 --- a/sys/dev/syscons/scvtb.c +++ b/sys/dev/syscons/scvtb.c @@ -26,11 +26,8 @@ * $FreeBSD$ */ -#include "sc.h" #include "opt_syscons.h" -#if NSC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> @@ -296,5 +293,3 @@ sc_vtb_ins(sc_vtb_t *vtb, int at, int count, int c, int attr) else fillw(attr | c, (void *)sc_vtb_pointer(vtb, at), count); } - -#endif /* NSC */ diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index a4303c1..b648cfb 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -28,7 +28,6 @@ * $FreeBSD$ */ -#include "sc.h" #include "splash.h" #include "opt_syscons.h" #include "opt_ddb.h" @@ -36,7 +35,6 @@ #include "apm.h" #endif -#if NSC > 0 #include <sys/param.h> #include <sys/systm.h> #include <sys/eventhandler.h> @@ -3406,5 +3404,3 @@ blink_screen(void *arg) timeout(blink_screen, scp, hz / 10); } } - -#endif /* NSC */ diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c index 8c28ab7..453215a 100644 --- a/sys/dev/syscons/sysmouse.c +++ b/sys/dev/syscons/sysmouse.c @@ -26,11 +26,8 @@ * $FreeBSD$ */ -#include "sc.h" #include "opt_syscons.h" -#if NSC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> @@ -340,5 +337,3 @@ sysmouse_event(mouse_info_t *info) } #endif /* !SC_NO_SYSMOUSE */ - -#endif /* NSC */ |