diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2025-01-07 05:36:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-07 05:36:00 (GMT) |
| commit | bbe0b33d2a6e73fb488a72a61329dafd974cbba6 (patch) | |
| tree | a7a0ff3c3443554fcce52553a6d2b08890c81b7b /Python | |
| parent | d81b99b53b55ae7146e6f50a87c1dfe04ff5f0ad (diff) | |
| download | cpython-bbe0b33d2a6e73fb488a72a61329dafd974cbba6.zip cpython-bbe0b33d2a6e73fb488a72a61329dafd974cbba6.tar.gz cpython-bbe0b33d2a6e73fb488a72a61329dafd974cbba6.tar.bz2 | |
[3.13] gh-128146: Exclude os/log.h import on older macOS versions. (GH-128165) (#128575)
gh-128146: Exclude os/log.h import on older macOS versions. (GH-128165)
Reworks the handling of Apple system log handling to account for older macOS
versions that don't provide os-log.
(cherry picked from commit e837a1f71e832ce8f551a6fac05e346f654457e0)
Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/pylifecycle.c | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index d23cfc6..d545123 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -44,8 +44,25 @@ #if defined(__APPLE__) # include <AvailabilityMacros.h> +# include <TargetConditionals.h> # include <mach-o/loader.h> -# include <os/log.h> +// The os_log unified logging APIs were introduced in macOS 10.12, iOS 10.0, +// tvOS 10.0, and watchOS 3.0; +# if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE +# define HAS_APPLE_SYSTEM_LOG 1 +# elif defined(TARGET_OS_OSX) && TARGET_OS_OSX +# if defined(MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12 +# define HAS_APPLE_SYSTEM_LOG 1 +# else +# define HAS_APPLE_SYSTEM_LOG 0 +# endif +# else +# define HAS_APPLE_SYSTEM_LOG 0 +# endif + +# if HAS_APPLE_SYSTEM_LOG +# include <os/log.h> +# endif #endif #ifdef HAVE_SIGNAL_H @@ -75,7 +92,7 @@ static PyStatus init_sys_streams(PyThreadState *tstate); #ifdef __ANDROID__ static PyStatus init_android_streams(PyThreadState *tstate); #endif -#if defined(__APPLE__) +#if defined(__APPLE__) && HAS_APPLE_SYSTEM_LOG static PyStatus init_apple_streams(PyThreadState *tstate); #endif static void wait_for_thread_shutdown(PyThreadState *tstate); @@ -1258,7 +1275,7 @@ init_interp_main(PyThreadState *tstate) return status; } #endif -#if defined(__APPLE__) +#if defined(__APPLE__) && HAS_APPLE_SYSTEM_LOG if (config->use_system_logger) { status = init_apple_streams(tstate); if (_PyStatus_EXCEPTION(status)) { @@ -2933,7 +2950,7 @@ done: #endif // __ANDROID__ -#if defined(__APPLE__) +#if defined(__APPLE__) && HAS_APPLE_SYSTEM_LOG static PyObject * apple_log_write_impl(PyObject *self, PyObject *args) @@ -2944,14 +2961,9 @@ apple_log_write_impl(PyObject *self, PyObject *args) return NULL; } - // Call the underlying Apple logging API. The os_log unified logging APIs - // were introduced in macOS 10.12, iOS 10.0, tvOS 10.0, and watchOS 3.0; - // this call is a no-op on older versions. - #if TARGET_OS_IPHONE || (TARGET_OS_OSX && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12) // Pass the user-provided text through explicit %s formatting // to avoid % literals being interpreted as a formatting directive. os_log_with_type(OS_LOG_DEFAULT, logtype, "%s", text); - #endif Py_RETURN_NONE; } @@ -2986,7 +2998,6 @@ init_apple_streams(PyThreadState *tstate) if (result == NULL) { goto error; } - goto done; error: @@ -3000,7 +3011,7 @@ done: return status; } -#endif // __APPLE__ +#endif // __APPLE__ && HAS_APPLE_SYSTEM_LOG static void |