diff options
| author | Frederic Cambus <fcambus@cvs.openbsd.org> | 2017-06-15 11:48:50 +0000 |
|---|---|---|
| committer | Frederic Cambus <fcambus@cvs.openbsd.org> | 2017-06-15 11:48:50 +0000 |
| commit | ec91d0dcf7aee9849fae3c7da637679ff1069753 (patch) | |
| tree | 11af590c8355fe36d523f4e53d2121605e3783c0 | |
| parent | 586ffa78abdcde322b5be70009f08d74b848d7a1 (diff) | |
We do not support iso7 nor pcvt encoding, so remove macro definitions
and commented entries.
OK mlarkin@
| -rw-r--r-- | sys/dev/wscons/wsconsio.h | 4 | ||||
| -rw-r--r-- | usr.sbin/wsfontload/wsfontload.c | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h index b3e5add95fd..de79bd627ff 100644 --- a/sys/dev/wscons/wsconsio.h +++ b/sys/dev/wscons/wsconsio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconsio.h,v 1.82 2017/06/13 08:00:24 fcambus Exp $ */ +/* $OpenBSD: wsconsio.h,v 1.83 2017/06/15 11:48:49 fcambus Exp $ */ /* $NetBSD: wsconsio.h,v 1.74 2005/04/28 07:15:44 martin Exp $ */ /* @@ -506,8 +506,6 @@ struct wsdisplay_font { int encoding; #define WSDISPLAY_FONTENC_ISO 0 #define WSDISPLAY_FONTENC_IBM 1 -#define WSDISPLAY_FONTENC_PCVT 2 -#define WSDISPLAY_FONTENC_ISO7 3 /* greek */ u_int fontwidth, fontheight, stride; #define WSDISPLAY_MAXFONTSZ (512*1024) int bitorder, byteorder; diff --git a/usr.sbin/wsfontload/wsfontload.c b/usr.sbin/wsfontload/wsfontload.c index 6c279f0587a..8c0b6813b42 100644 --- a/usr.sbin/wsfontload/wsfontload.c +++ b/usr.sbin/wsfontload/wsfontload.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsfontload.c,v 1.16 2015/09/06 20:07:46 tobias Exp $ */ +/* $OpenBSD: wsfontload.c,v 1.17 2017/06/15 11:48:49 fcambus Exp $ */ /* $NetBSD: wsfontload.c,v 1.2 2000/01/05 18:46:43 ad Exp $ */ /* @@ -75,10 +75,6 @@ static const struct { } encodings[] = { {"iso", WSDISPLAY_FONTENC_ISO}, {"ibm", WSDISPLAY_FONTENC_IBM}, -#if 0 - {"pcvt", WSDISPLAY_FONTENC_PCVT}, - {"iso7", WSDISPLAY_FONTENC_ISO7}, -#endif }; int |