[OMPT-svn-commit] OpenMPT r21449 - in trunk/OpenMPT: common src/mpt/io_read

[<sv...@op...>]

Author: manx
Date: Thu Aug 15 19:28:40 2024
New Revision: 21449
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21449

Log:
[Ref] mpt/io_read/filedata.hpp: Add MPT_CONFIGURATION_IO_READ_FILEDATA_NO_64BIT, and default to 64bit file offset support. See <https://bugs.openmpt.org/view.php?id=1647>.
[Ref] Set MPT_CONFIGURATION_IO_READ_FILEDATA_NO_64BIT as the OpenMPT codebase is not yet ready for 64bit file offsets.

Modified:
   trunk/OpenMPT/common/BuildSettings.h
   trunk/OpenMPT/src/mpt/io_read/filedata.hpp

Modified: trunk/OpenMPT/common/BuildSettings.h
==============================================================================
--- trunk/OpenMPT/common/BuildSettings.h	Thu Aug 15 16:43:50 2024	(r21448)
+++ trunk/OpenMPT/common/BuildSettings.h	Thu Aug 15 19:28:40 2024	(r21449)
@@ -326,6 +326,8 @@
 
 #endif
 
+#define MPT_CONFIGURATION_IO_READ_FILEDATA_NO_64BIT
+
 
 
 // platform configuration

Modified: trunk/OpenMPT/src/mpt/io_read/filedata.hpp
==============================================================================
--- trunk/OpenMPT/src/mpt/io_read/filedata.hpp	Thu Aug 15 16:43:50 2024	(r21448)
+++ trunk/OpenMPT/src/mpt/io_read/filedata.hpp	Thu Aug 15 19:28:40 2024	(r21449)
@@ -5,12 +5,17 @@
 
 
 
+#if !defined(MPT_CONFIGURATION_IO_READ_FILEDATA_NO_64BIT)
+#include "mpt/base/integer.hpp"
+#endif // !MPT_CONFIGURATION_IO_READ_FILEDATA_NO_64BIT
 #include "mpt/base/memory.hpp"
 #include "mpt/base/namespace.hpp"
 
 #include <algorithm>
 
+#if defined(MPT_CONFIGURATION_IO_READ_FILEDATA_NO_64BIT)
 #include <cstddef>
+#endif // MPT_CONFIGURATION_IO_READ_FILEDATA_NO_64BIT
 
 
 
@@ -25,7 +30,11 @@
 
 class IFileData {
 public:
+#if !defined(MPT_CONFIGURATION_IO_READ_FILEDATA_NO_64BIT)
+	using pos_type = uint64;
+#else // MPT_CONFIGURATION_IO_READ_FILEDATA_NO_64BIT
 	using pos_type = std::size_t;
+#endif // MPT_CONFIGURATION_IO_READ_FILEDATA_NO_64BIT
 
 protected:
 	IFileData() = default;