diff options
| author | joerg <joerg@FreeBSD.org> | 2002-01-27 09:17:27 +0000 |
|---|---|---|
| committer | joerg <joerg@FreeBSD.org> | 2002-01-27 09:17:27 +0000 |
| commit | ea6b809e7d17f67670458d8b26735098ed0ec32a (patch) | |
| tree | 9a5b71335a2ad8a522715a1e5339df0f6ae5a73e /sys | |
| parent | 9b17f473d9c45d8e9a797492788df4885c60f4bd (diff) | |
| download | FreeBSD-src-ea6b809e7d17f67670458d8b26735098ed0ec32a.zip FreeBSD-src-ea6b809e7d17f67670458d8b26735098ed0ec32a.tar.gz | |
Unbreak pcvt, it suffered from common variables. Whoever added the
-fno-common could not have possibly compiled LINT afterwards with
this...
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/i386/isa/pcvt/pcvt_hdr.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h index 46ea500..19003ef 100644 --- a/sys/i386/isa/pcvt/pcvt_hdr.h +++ b/sys/i386/isa/pcvt/pcvt_hdr.h @@ -558,13 +558,19 @@ * variables *===========================================================================*/ -u_char *more_chars; /* response buffer via kbd */ -u_char color; /* color or mono display */ +#ifdef MAIN +# define EXTERN /* actually define variables when included from pcvt_drv.c */ +#else +# define EXTERN extern /* declare them only */ +#endif + +EXTERN u_char *more_chars; /* response buffer via kbd */ +EXTERN u_char color; /* color or mono display */ -u_short kern_attr; /* kernel messages char attributes */ -u_short user_attr; /* character attributes */ +EXTERN u_short kern_attr; /* kernel messages char attributes */ +EXTERN u_short user_attr; /* character attributes */ -struct tty pcvt_tty[PCVT_NSCREENS]; +EXTERN struct tty pcvt_tty[PCVT_NSCREENS]; struct sixels { u_char lower[MAXSIXEL]; /* lower half of char */ @@ -701,7 +707,7 @@ typedef struct video_state { #endif /* XSERVER */ } video_state; -video_state vs[PCVT_NSCREENS]; /* parameters for screens */ +EXTERN video_state vs[PCVT_NSCREENS]; /* parameters for screens */ struct vga_char_state { int loaded; /* Whether a font is loaded here */ @@ -712,9 +718,9 @@ struct vga_char_state { int screen_size; /* Screen size in SIZ_YYROWS */ }; -struct vga_char_state vgacs[NVGAFONTS]; /* Character set states */ +EXTERN struct vga_char_state vgacs[NVGAFONTS]; /* Character set states */ -u_short *Crtat; /* screen start address */ +EXTERN u_short *Crtat; /* screen start address */ #ifdef MAIN |
