From c2ccb56117b9a19e8f761af32e32a37c59f6994e Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Thu, 19 Dec 2019 19:56:55 -0400 Subject: [PATCH] Remove an obsolete workaround for a Windows bug in physfs 2.0.2. --HG-- branch : minor --- src/modules/filesystem/physfs/File.cpp | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/modules/filesystem/physfs/File.cpp b/src/modules/filesystem/physfs/File.cpp index 4453b262d..11bdc4b5d 100644 --- a/src/modules/filesystem/physfs/File.cpp +++ b/src/modules/filesystem/physfs/File.cpp @@ -195,26 +195,9 @@ bool File::flush() return PHYSFS_flush(file) != 0; } -#ifdef LOVE_WINDOWS -// MSVC doesn't like the 'this' keyword -// well, we'll use 'that'. -// It zigs, we zag. -inline bool test_eof(File *that, PHYSFS_File *) -{ - int64 pos = that->tell(); - int64 size = that->getSize(); - return pos == -1 || size == -1 || pos >= size; -} -#else -inline bool test_eof(File *, PHYSFS_File *file) -{ - return PHYSFS_eof(file); -} -#endif - bool File::isEOF() { - return file == nullptr || test_eof(this, file); + return file == nullptr || PHYSFS_eof(file); } int64 File::tell()