Merge branch 'master' of https://github.com/86Box/86Box

2022-05-20 01:35:44 +02:00
parent fb2658bfec 7d9fb688ac
commit 276f16dfa5
4 changed files with 12 additions and 8 deletions
--- a/src/include/86box/vid_svga.h
+++ b/src/include/86box/vid_svga.h
@@ -165,8 +165,6 @@ typedef struct svga_t

 	int force_old_addr;

-    int vga_on;
-
 	int remap_required;
 	uint32_t (*remap_func)(struct svga_t *svga, uint32_t in_addr);

@@ -174,6 +172,7 @@ typedef struct svga_t
 } svga_t;

 extern svga_t *svga_8514;
+extern int vga_on;

 extern void ibm8514_poll(ibm8514_t *dev, svga_t *svga);
 extern void ibm8514_recalctimings(svga_t *svga);