Module Name: src
Committed By: fcambus
Date: Thu Mar 5 18:20:38 UTC 2020
Modified Files:
src/sys/dev/wsfont: wsfont.c
Log Message:
Remove references to non-existing fonts.
Include files with font data (courier11x18.h and iso8x16.h) were removed
in 1999 due to licensing concerns.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/wsfont/wsfont.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfont/wsfont.c
diff -u src/sys/dev/wsfont/wsfont.c:1.66 src/sys/dev/wsfont/wsfont.c:1.67
--- src/sys/dev/wsfont/wsfont.c:1.66 Sun Apr 7 13:48:27 2019
+++ src/sys/dev/wsfont/wsfont.c Thu Mar 5 18:20:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.c,v 1.66 2019/04/07 13:48:27 jmcneill Exp $ */
+/* $NetBSD: wsfont.c,v 1.67 2020/03/05 18:20:38 fcambus Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.66 2019/04/07 13:48:27 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.67 2020/03/05 18:20:38 fcambus Exp $");
#include "opt_wsfont.h"
@@ -218,12 +218,6 @@ static struct font builtin_fonts[] = {
#ifdef FONT_BOLD16x32
{ { NULL, NULL }, &bold16x32, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
#endif
-#ifdef FONT_ISO8x16
- { { NULL, NULL }, &iso8x16, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
-#endif
-#ifdef FONT_COURIER11x18
- { { NULL, NULL }, &courier11x18, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
-#endif
#ifdef FONT_GALLANT12x22
{ { NULL, NULL }, &gallant12x22, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
#endif