diff options
| author | thegeorg <[email protected]> | 2024-02-13 23:26:03 +0300 |
|---|---|---|
| committer | thegeorg <[email protected]> | 2024-02-13 23:38:14 +0300 |
| commit | 9ebcb44e371e9a12d6ee07b3a5b8a9307f8b060a (patch) | |
| tree | a595fb60b1699b77b5abc98684b30acc9a9634ab | |
| parent | 5b1c50adb58a15059b0510a4930fbb8429795976 (diff) | |
Revert a patch on boost/assert to make it compatible with modern macOS
| -rw-r--r-- | contrib/restricted/boost/assert/include/boost/assert/source_location.hpp | 6 | ||||
| -rw-r--r-- | contrib/tools/python/src/Include/pyconfig.win32.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/contrib/restricted/boost/assert/include/boost/assert/source_location.hpp b/contrib/restricted/boost/assert/include/boost/assert/source_location.hpp index 2349ed8a2ff..a265ad5cb8b 100644 --- a/contrib/restricted/boost/assert/include/boost/assert/source_location.hpp +++ b/contrib/restricted/boost/assert/include/boost/assert/source_location.hpp @@ -15,7 +15,7 @@ #include <cstring> #if defined(__cpp_lib_source_location) && __cpp_lib_source_location >= 201907L -#include <source_location> +# include <source_location> #endif namespace boost @@ -73,7 +73,11 @@ public: # pragma warning( disable: 4996 ) #endif +#if ( defined(_MSC_VER) && _MSC_VER < 1900 ) || ( defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) ) # define BOOST_ASSERT_SNPRINTF(buffer, format, arg) std::sprintf(buffer, format, arg) +#else +# define BOOST_ASSERT_SNPRINTF(buffer, format, arg) std::snprintf(buffer, sizeof(buffer)/sizeof(buffer[0]), format, arg) +#endif std::string to_string() const { diff --git a/contrib/tools/python/src/Include/pyconfig.win32.h b/contrib/tools/python/src/Include/pyconfig.win32.h index 3640ccd81a8..8aeb631ab1e 100644 --- a/contrib/tools/python/src/Include/pyconfig.win32.h +++ b/contrib/tools/python/src/Include/pyconfig.win32.h @@ -666,6 +666,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ /* Define if you have waitpid. */ /* #undef HAVE_WAITPID */ +#define HAVE_SNPRINTF 1 /* Define to 1 if you have the `wcscoll' function. */ #ifndef MS_WINCE |