Bug 25002
| Summary: | forgotten MFC on mkscrfil.c | ||
|---|---|---|---|
| Product: | Base System | Reporter: | Trevor Johnson <trevor> |
| Component: | bin | Assignee: | Poul-Henning Kamp <phk> |
| Status: | Closed FIXED | ||
| Severity: | Affects Only Me | ||
| Priority: | Normal | ||
| Version: | 4.2-STABLE | ||
| Hardware: | Any | ||
| OS: | Any | ||
State Changed From-To: open->feedback I have a hard time making sense of this PR. RELENG_4 still has the file, it was only removed in -current ? State Changed From-To: feedback->closed I was mistaken. The header file is there. It just wasn't found because I was trying to compile under -CURRENT. |
In RELENG_4, <machine/console.h> was removed 2001-01-16. The share/syscons/scrnmaps/mkscrfil.c needs to be changed to reflect this. The HEAD branch was changed but the MFC has not been done. I marked this as serious because it breaks "make buildworld". Fix: #include <sys/ioctl.h> -#include <machine/console.h> +#include <sys/consio.h> #include <stdio.h> #include FIL--Oqdna0yF8VaOgQLGDZhg4zbVcVWbWR4M8I65btf8dUWPJw7C Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" Index: mkscrfil.c =================================================================== RCS file: /home/ncvs/src/share/syscons/scrnmaps/mkscrfil.c,v retrieving revision 1.1 diff -u -r1.1 mkscrfil.c --- mkscrfil.c 1994/09/25 03:41:43 1.1 +++ mkscrfil.c 2001/02/11 12:18:34 @@ -25,7 +25,7 @@ */ How-To-Repeat: # cd /usr/src/share/syscons/scrnmaps; make build-tools cc -static -O -pipe -I/usr/src/share/syscons/scrnmaps -DFIL=\"koi8-r2cp866\" -o koi8-r2cp866.mk /usr/src/share/syscons/scrnmaps/mkscrfil.c In file included from /usr/src/share/syscons/scrnmaps/mkscrfil.c:28: /usr/include/machine/console.h:3: #error "this file includes <machine/console.h> which is deprecated, use <sys/{kb,cons,fb}io.h> instead" In file included from /usr/src/share/syscons/scrnmaps/mkscrfil.c:31: /usr/src/share/syscons/scrnmaps/koi8-r2cp866:27: syntax error before `scrmap' /usr/src/share/syscons/scrnmaps/koi8-r2cp866:28: warning: excess elements in scalar initializer