adopt for new MinGW

This commit is contained in:
2025-01-06 12:55:44 +03:00
parent 15548de79c
commit f334a6603f
6 changed files with 10 additions and 5 deletions

View File

@@ -20,17 +20,19 @@
#include "piincludes_p.h" #include "piincludes_p.h"
#include "piliterals_time.h" #include "piliterals_time.h"
// clang-format off
#ifndef WINDOWS #ifndef WINDOWS
# include <fcntl.h> # include <fcntl.h>
# include <sys/ioctl.h> # include <sys/ioctl.h>
# include <termios.h> # include <termios.h>
#else #else
# include <wincon.h>
# include <wingdi.h> # include <wingdi.h>
# include <wincon.h>
# ifndef COMMON_LVB_UNDERSCORE # ifndef COMMON_LVB_UNDERSCORE
# define COMMON_LVB_UNDERSCORE 0x8000 # define COMMON_LVB_UNDERSCORE 0x8000
# endif # endif
#endif #endif
// clang-format on
using namespace PIScreenTypes; using namespace PIScreenTypes;

View File

@@ -23,7 +23,6 @@
#include "pisharedmemory.h" #include "pisharedmemory.h"
#ifndef MICRO_PIP #ifndef MICRO_PIP
# ifdef WINDOWS # ifdef WINDOWS
# include <wincon.h>
# include <windows.h> # include <windows.h>
# include <wingdi.h> # include <wingdi.h>
# include <winuser.h> # include <winuser.h>

View File

@@ -21,12 +21,14 @@
#include "piincludes_p.h" #include "piincludes_p.h"
#include "piliterals.h" #include "piliterals.h"
#include "piwaitevent_p.h" #include "piwaitevent_p.h"
// clang-format off
#ifndef WINDOWS #ifndef WINDOWS
# include <termios.h> # include <termios.h>
#else #else
# include <wincon.h>
# include <wingdi.h> # include <wingdi.h>
# include <wincon.h>
#endif #endif
// clang-format on
/** \class PIKbdListener /** \class PIKbdListener
* \brief Keyboard console input listener * \brief Keyboard console input listener

View File

@@ -46,6 +46,7 @@
#include <atomic> #include <atomic>
#include <cassert> #include <cassert>
#include <cstddef> #include <cstddef>
#include <cstdio>
#include <functional> #include <functional>
#include <initializer_list> #include <initializer_list>
#include <limits> #include <limits>

View File

@@ -28,7 +28,6 @@
# include <locale> # include <locale>
#endif #endif
#ifdef WINDOWS #ifdef WINDOWS
# include <wincon.h>
# include <windows.h> # include <windows.h>
# include <wingdi.h> # include <wingdi.h>
# define COMMON_LVB_UNDERSCORE 0x8000 # define COMMON_LVB_UNDERSCORE 0x8000

View File

@@ -31,8 +31,10 @@ int main(int argc, char * argv[]) {
# include "piscreentypes.h" # include "piscreentypes.h"
# include "pisharedmemory.h" # include "pisharedmemory.h"
# include <wincon.h> // clang-format off
# include <wingdi.h> # include <wingdi.h>
# include <wincon.h>
// clang-format on
PIVector<PIVector<PIScreenTypes::Cell>> cells; PIVector<PIVector<PIScreenTypes::Cell>> cells;