The branch main has been updated by jhb:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=113925b0b3b25e66af8f477da4d10380872ed929

commit 113925b0b3b25e66af8f477da4d10380872ed929
Author:     John Baldwin <j...@freebsd.org>
AuthorDate: 2022-04-12 21:59:00 +0000
Commit:     John Baldwin <j...@freebsd.org>
CommitDate: 2022-04-12 21:59:00 +0000

    syscons VGA draw_txtcharcursor: Move sc under #ifndef SC_NO_FONT_LOADING.
---
 sys/dev/syscons/scvgarndr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c
index 446a6313f419..963bfec87f37 100644
--- a/sys/dev/syscons/scvgarndr.c
+++ b/sys/dev/syscons/scvgarndr.c
@@ -496,11 +496,11 @@ vga_txtcursor_shape(scr_stat *scp, int base, int height, 
int blink)
 static void
 draw_txtcharcursor(scr_stat *scp, int at, u_short c, u_short a, int flip)
 {
+#ifndef SC_NO_FONT_LOADING
        sc_softc_t *sc;
 
        sc = scp->sc;
 
-#ifndef SC_NO_FONT_LOADING
        if (scp->curs_attr.flags & CONS_CHAR_CURSOR) {
                unsigned char *font;
                int h;

Reply via email to