Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions lib/input.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,21 @@
#include <sys/stat.h>
#include <sys/types.h>

#if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(_WIN64) || defined(__BORLANDC__)) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__MINGW64__)
#if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(_WIN64) || defined(__BORLANDC__)) && !defined(__CYGWIN__)
# define REFLEX_WINDOWS_FILE_IO 1
#else
# define REFLEX_WINDOWS_FILE_IO 0
#endif

#if REFLEX_WINDOWS_FILE_IO
# include <io.h>
# include <fcntl.h>
# define off_t __int64
# define ftello _ftelli64
# define fseeko _fseeki64
#else
# include <unistd.h> // off_t, fstat()
# if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(_WIN64)) && (defined(__MINGW32__) || defined(__MINGW64__)) && defined(_UCRT)
# include <winsock2.h>
# else
# include <sys/select.h>
# endif
# include <sys/select.h>
#endif

namespace reflex {
Expand Down Expand Up @@ -653,7 +655,7 @@ void Input::file_init()
{
// attempt to determine the file size with fstat()
#if !defined(HAVE_CONFIG_H) || defined(HAVE_FSTAT)
#if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(_WIN64) || defined(__BORLANDC__)) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__MINGW64__)
#if REFLEX_WINDOWS_FILE_IO
struct _stat st;
if (_fstat(_fileno(file_), &st) == 0 && ((st.st_mode & S_IFMT) == S_IFREG) && st.st_size <= 4294967295LL)
#else
Expand Down Expand Up @@ -1030,7 +1032,7 @@ bool Input::file_ready()
{
if (file_ == NULL || feof(file_))
return false;
#if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(_WIN64) || defined(__BORLANDC__)) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__MINGW64__)
#if REFLEX_WINDOWS_FILE_IO
return !ferror(file_);
#else
int fd = fileno(file_);
Expand Down