Skip to content

Commit dada3d2

Browse files
authored
Merge pull request #240 from bredelings/fix-mingw-input-select
Fix compile error on windows using mingw
2 parents eb6d382 + 25fedb2 commit dada3d2

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

‎lib/input.cpp‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,21 @@
3939
#include <sys/stat.h>
4040
#include <sys/types.h>
4141

42-
#if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(_WIN64) || defined(__BORLANDC__)) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__MINGW64__)
42+
#if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(_WIN64) || defined(__BORLANDC__)) && !defined(__CYGWIN__)
43+
# define REFLEX_WINDOWS_FILE_IO 1
44+
#else
45+
# define REFLEX_WINDOWS_FILE_IO 0
46+
#endif
47+
48+
#if REFLEX_WINDOWS_FILE_IO
4349
# include <io.h>
4450
# include <fcntl.h>
4551
# define off_t __int64
4652
# define ftello _ftelli64
4753
# define fseeko _fseeki64
4854
#else
4955
# include <unistd.h> // off_t, fstat()
50-
# if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(_WIN64)) && (defined(__MINGW32__) || defined(__MINGW64__)) && defined(_UCRT)
51-
# include <winsock2.h>
52-
# else
53-
# include <sys/select.h>
54-
# endif
56+
# include <sys/select.h>
5557
#endif
5658

5759
namespace reflex {
@@ -653,7 +655,7 @@ void Input::file_init()
653655
{
654656
// attempt to determine the file size with fstat()
655657
#if !defined(HAVE_CONFIG_H) || defined(HAVE_FSTAT)
656-
#if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(_WIN64) || defined(__BORLANDC__)) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__MINGW64__)
658+
#if REFLEX_WINDOWS_FILE_IO
657659
struct _stat st;
658660
if (_fstat(_fileno(file_), &st) == 0 && ((st.st_mode & S_IFMT) == S_IFREG) && st.st_size <= 4294967295LL)
659661
#else
@@ -1030,7 +1032,7 @@ bool Input::file_ready()
10301032
{
10311033
if (file_ == NULL || feof(file_))
10321034
return false;
1033-
#if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(_WIN64) || defined(__BORLANDC__)) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__MINGW64__)
1035+
#if REFLEX_WINDOWS_FILE_IO
10341036
return !ferror(file_);
10351037
#else
10361038
int fd = fileno(file_);

0 commit comments

Comments
 (0)