|
26 | 26 | # include <TargetConditionals.h> |
27 | 27 | # include <mach-o/loader.h> |
28 | 28 | // The os_log unified logging APIs were introduced in macOS 10.12, iOS 10.0, |
29 | | -// tvOS 10.0, and watchOS 3.0; |
| 29 | +// tvOS 10.0, and watchOS 3.0; we enable the use of the system logger |
| 30 | +// automatically on non-macOS platforms. |
30 | 31 | # if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE |
31 | | -# define HAS_APPLE_SYSTEM_LOG 1 |
32 | | -# elif defined(TARGET_OS_OSX) && TARGET_OS_OSX |
33 | | -# if defined(MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12 |
34 | | -# define HAS_APPLE_SYSTEM_LOG 1 |
35 | | -# else |
36 | | -# define HAS_APPLE_SYSTEM_LOG 0 |
37 | | -# endif |
| 32 | +# define USE_APPLE_SYSTEM_LOG 1 |
38 | 33 | # else |
39 | | -# define HAS_APPLE_SYSTEM_LOG 0 |
| 34 | +# define USE_APPLE_SYSTEM_LOG 0 |
40 | 35 | # endif |
41 | 36 |
|
42 | | -# if HAS_APPLE_SYSTEM_LOG |
| 37 | +# if USE_APPLE_SYSTEM_LOG |
43 | 38 | # include <os/log.h> |
44 | 39 | # endif |
45 | 40 | #endif |
@@ -81,7 +76,7 @@ static PyStatus init_import_site(void); |
81 | 76 | static PyStatus init_set_builtins_open(void); |
82 | 77 | static PyStatus init_sys_streams(PyThreadState *tstate); |
83 | 78 | static void call_py_exitfuncs(PyThreadState *tstate); |
84 | | -#if defined(__APPLE__) && HAS_APPLE_SYSTEM_LOG |
| 79 | +#if defined(__APPLE__) && USE_APPLE_SYSTEM_LOG |
85 | 80 | static PyStatus init_apple_streams(PyThreadState *tstate); |
86 | 81 | #endif |
87 | 82 | static void wait_for_thread_shutdown(PyThreadState *tstate); |
@@ -1057,12 +1052,10 @@ init_interp_main(PyThreadState *tstate) |
1057 | 1052 | return status; |
1058 | 1053 | } |
1059 | 1054 |
|
1060 | | -#if defined(__APPLE__) && HAS_APPLE_SYSTEM_LOG |
1061 | | - if (config->use_system_logger) { |
1062 | | - status = init_apple_streams(tstate); |
1063 | | - if (_PyStatus_EXCEPTION(status)) { |
1064 | | - return status; |
1065 | | - } |
| 1055 | +#if defined(__APPLE__) && USE_APPLE_SYSTEM_LOG |
| 1056 | + status = init_apple_streams(tstate); |
| 1057 | + if (_PyStatus_EXCEPTION(status)) { |
| 1058 | + return status; |
1066 | 1059 | } |
1067 | 1060 | #endif |
1068 | 1061 |
|
@@ -2095,7 +2088,7 @@ init_sys_streams(PyThreadState *tstate) |
2095 | 2088 | return res; |
2096 | 2089 | } |
2097 | 2090 |
|
2098 | | -#if defined(__APPLE__) && HAS_APPLE_SYSTEM_LOG |
| 2091 | +#if defined(__APPLE__) && USE_APPLE_SYSTEM_LOG |
2099 | 2092 |
|
2100 | 2093 | static PyObject * |
2101 | 2094 | apple_log_write_impl(PyObject *self, PyObject *args) |
@@ -2156,7 +2149,7 @@ init_apple_streams(PyThreadState *tstate) |
2156 | 2149 | return status; |
2157 | 2150 | } |
2158 | 2151 |
|
2159 | | -#endif // __APPLE__ && HAS_APPLE_SYSTEM_LOG |
| 2152 | +#endif // __APPLE__ && USE_APPLE_SYSTEM_LOG |
2160 | 2153 |
|
2161 | 2154 |
|
2162 | 2155 | static void |
|
0 commit comments