From cbdaabee4af2bb6e2b3a69055333e58460cc1824 Mon Sep 17 00:00:00 2001
From: peri4 <peri4ko@yandex.ru>
Date: Fri, 7 Jan 2022 01:58:38 +0300
Subject: [PATCH] some build fixes

---
 libs/console/piscreen.cpp           | 8 +++-----
 libs/console/piterminal.cpp         | 1 +
 libs/main/console/pikbdlistener.cpp | 1 +
 libs/main/core/pibytearray.h        | 1 +
 libs/main/core/picout.cpp           | 1 +
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/libs/console/piscreen.cpp b/libs/console/piscreen.cpp
index 786c1b02..9dbb9c70 100644
--- a/libs/console/piscreen.cpp
+++ b/libs/console/piscreen.cpp
@@ -23,6 +23,7 @@
 #  include <fcntl.h>
 #  include <termios.h>
 #else
+#  include <wingdi.h>
 #  include <wincon.h>
 #  ifndef COMMON_LVB_UNDERSCORE
 #    define COMMON_LVB_UNDERSCORE 0x8000
@@ -108,16 +109,13 @@ void PIScreen::SystemConsole::end() {
 
 
 void PIScreen::SystemConsole::prepare() {
-	int w, h;
+	int w = 80, h = 24;
 #ifdef WINDOWS
 	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->csbi);
 	w = PRIVATE->csbi.srWindow.Right - PRIVATE->csbi.srWindow.Left + 1;
 	h = PRIVATE->csbi.srWindow.Bottom - PRIVATE->csbi.srWindow.Top + 1;
 #else
-#  ifdef FREERTOS
-	w = 80;
-	h = 24;
-#  else
+#  ifndef FREERTOS
 	winsize ws;
 	ioctl(0, TIOCGWINSZ, &ws);
 	w = ws.ws_col;
diff --git a/libs/console/piterminal.cpp b/libs/console/piterminal.cpp
index ce9623aa..75163b8e 100644
--- a/libs/console/piterminal.cpp
+++ b/libs/console/piterminal.cpp
@@ -22,6 +22,7 @@
 #ifndef FREERTOS
 #ifdef WINDOWS
 #  include <windows.h>
+#  include <wingdi.h>
 #  include <wincon.h>
 #  include <winuser.h>
 #else
diff --git a/libs/main/console/pikbdlistener.cpp b/libs/main/console/pikbdlistener.cpp
index c6d56126..6d7d6d3a 100644
--- a/libs/main/console/pikbdlistener.cpp
+++ b/libs/main/console/pikbdlistener.cpp
@@ -21,6 +21,7 @@
 #ifndef WINDOWS
 #  include <termios.h>
 #else
+#  include <wingdi.h>
 #  include <wincon.h>
 #endif
 
diff --git a/libs/main/core/pibytearray.h b/libs/main/core/pibytearray.h
index 721d7030..40ed546c 100644
--- a/libs/main/core/pibytearray.h
+++ b/libs/main/core/pibytearray.h
@@ -27,6 +27,7 @@
 #include "pibitarray.h"
 #include "pimap.h"
 #include "pivector2d.h"
+#include <stdio.h>
 
 #ifdef FREERTOS
 #  define _TYPENAME_(T) "?"
diff --git a/libs/main/core/picout.cpp b/libs/main/core/picout.cpp
index c1b9d54b..edc61909 100644
--- a/libs/main/core/picout.cpp
+++ b/libs/main/core/picout.cpp
@@ -24,6 +24,7 @@
 #include "pistring_std.h"
 #ifdef WINDOWS
 #  include <windows.h>
+#  include <wingdi.h>
 #  include <wincon.h>
 #  define COMMON_LVB_UNDERSCORE 0x8000
 #endif