[OMPT-svn-commit] OpenMPT r21263 - trunk/OpenMPT/common

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

Author: manx
Date: Tue Jul 23 11:35:35 2024
New Revision: 21263
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21263

Log:
[Fix] mptTime: Work-around missing std::chrono::zoned_time with Wine Integration in C++20 mode with libstdc++ before 13.

Modified:
   trunk/OpenMPT/common/mptTime.cpp
   trunk/OpenMPT/common/mptTime.h

Modified: trunk/OpenMPT/common/mptTime.cpp
==============================================================================
--- trunk/OpenMPT/common/mptTime.cpp	Tue Jul 23 11:35:20 2024	(r21262)
+++ trunk/OpenMPT/common/mptTime.cpp	Tue Jul 23 11:35:35 2024	(r21263)
@@ -17,7 +17,7 @@
 
 #include "mptStringBuffer.h"
 
-#if MPT_CXX_AT_LEAST(20) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO_DATE)
+#if MPT_CXX_AT_LEAST(20) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO_DATE) && !(defined(MOGPLUG_TRACKER) && defined(MPT_LIBCXX_QUIRK_CHRONO_DATE_NO_ZONED_TIME))
 #include <chrono>
 #endif
 

Modified: trunk/OpenMPT/common/mptTime.h
==============================================================================
--- trunk/OpenMPT/common/mptTime.h	Tue Jul 23 11:35:20 2024	(r21262)
+++ trunk/OpenMPT/common/mptTime.h	Tue Jul 23 11:35:35 2024	(r21263)
@@ -175,7 +175,7 @@
 
 } // namespace nochrono
 
-#if MPT_CXX_AT_LEAST(20) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO_DATE)
+#if MPT_CXX_AT_LEAST(20) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO) && !defined(MPT_LIBCXX_QUIRK_NO_CHRONO_DATE) && !(defined(MOGPLUG_TRACKER) && defined(MPT_LIBCXX_QUIRK_CHRONO_DATE_NO_ZONED_TIME))
 
 using Unix = std::chrono::system_clock::time_point;