commit e6a16e9950111adfcfdb85261b3d5a8c13f1d533
author Bram Moolenaar <Bram@vim.org> Mon Oct 17 14:51:36 2022 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Oct 17 14:51:36 2022 +0100
tree f141728d6063ba98710cba6ae009e0ab96be176f
parent a1a46da87d91cfbf46866627b3e66a757145e8c3

patch 9.0.0781: workaround to rename "small" to "smallfont" is clumsy

Problem:    Workaround to rename "small" to "smallfont" is clumsy.
Solution:   Undefine "small" after including windows.h. (Ken Takata)

src/libvterm/t/harness.c

diff --git a/src/libvterm/t/harness.c b/src/libvterm/t/harness.c
index 859503f..d12c120 100644
--- a/src/libvterm/t/harness.c
+++ b/src/libvterm/t/harness.c
@@ -410,7 +410,7 @@
   int conceal;
   int strike;
   int font;
-  int smallfont;
+  int small;
   int baseline;
   VTermColor foreground;
   VTermColor background;
@@ -443,7 +443,7 @@
     state_pen.font = val->number;
     break;
   case VTERM_ATTR_SMALL:
-    state_pen.smallfont = val->boolean;
+    state_pen.small = val->boolean;
     break;
   case VTERM_ATTR_BASELINE:
     state_pen.baseline = val->number;
@@ -1015,11 +1015,11 @@
         }
         else if(streq(linep, "small")) {
           vterm_state_get_penattr(state, VTERM_ATTR_SMALL, &val);
-          if(val.boolean != state_pen.smallfont)
+          if(val.boolean != state_pen.small)
             printf("! pen small mismatch; state=%s, event=%s\n",
-                BOOLSTR(val.boolean), BOOLSTR(state_pen.smallfont));
+                BOOLSTR(val.boolean), BOOLSTR(state_pen.small));
           else
-            printf("%s\n", BOOLSTR(state_pen.smallfont));
+            printf("%s\n", BOOLSTR(state_pen.small));
         }
         else if(streq(linep, "baseline")) {
           vterm_state_get_penattr(state, VTERM_ATTR_BASELINE, &val);
@@ -1160,7 +1160,7 @@
         if(cell.attrs.blink)     printf("K");
         if(cell.attrs.reverse)   printf("R");
         if(cell.attrs.font)      printf("F%d", cell.attrs.font);
-        if(cell.attrs.smallfont) printf("S");
+        if(cell.attrs.small)     printf("S");
         if(cell.attrs.baseline)  printf(
             cell.attrs.baseline == VTERM_BASELINE_RAISE ? "^" :
                                                           "_");