[OMPT-svn-commit] OpenMPT r22720 - in branches/OpenMPT-1.31: . src/mpt/check

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

Author: manx
Date: Thu Jan  2 23:00:10 2025
New Revision: 22720
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22720

Log:
Merged revision(s) 22717 from trunk/OpenMPT:
[Imp] mpt/check/libc.hpp: Guard against UNICODE/_UNICODE mismatch.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/src/mpt/check/libc.hpp

Modified: branches/OpenMPT-1.31/src/mpt/check/libc.hpp
==============================================================================
--- branches/OpenMPT-1.31/src/mpt/check/libc.hpp	Thu Jan  2 22:59:28 2025	(r22719)
+++ branches/OpenMPT-1.31/src/mpt/check/libc.hpp	Thu Jan  2 23:00:10 2025	(r22720)
@@ -4,6 +4,7 @@
 #define MPT_CHECK_LIBC_HPP
 
 #include "mpt/base/detect_libc.hpp"
+#include "mpt/base/detect_os.hpp"
 #include "mpt/base/detect_quirks.hpp"
 #include "mpt/base/compiletime_warning.hpp"
 
@@ -30,4 +31,14 @@
 #endif
 #endif
 
+#ifndef MPT_CHECK_LIBC_IGNORE_WARNING_UNICODE_MISMATCH
+#if MPT_OS_WINDWOS
+#ifdef UNICODE
+#ifndef _UNICODE
+MPT_WARNING("UNICODE is defined but _UNICODE is not defined. Please #define _UNICODE.")
+#endif
+#endif
+#endif // MPT_OS_WINDOWS
+#endif
+
 #endif // MPT_CHECK_LIBC_HPP