https://github.com/python/cpython/commit/2067378e6d6e00ba452fb139f9cababf525178dc
commit: 2067378e6d6e00ba452fb139f9cababf525178dc
branch: main
author: Pablo Galindo Salgado <[email protected]>
committer: pablogsal <[email protected]>
date: 2025-04-06T21:39:25+01:00
summary:
gh-131591: Handle includes for iOS in remote_debugging.c (#132050)
files:
M Include/internal/pycore_ceval.h
M Python/remote_debugging.c
diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h
index c44f3a283e8fb6..18c8bc0624fea7 100644
--- a/Include/internal/pycore_ceval.h
+++ b/Include/internal/pycore_ceval.h
@@ -351,6 +351,7 @@ PyAPI_FUNC(_PyStackRef)
_PyFloat_FromDouble_ConsumeInputs(_PyStackRef left, _PyS
#ifndef Py_SUPPORTS_REMOTE_DEBUG
#if defined(__APPLE__)
+ #include <TargetConditionals.h>
# if !defined(TARGET_OS_OSX)
// Older macOS SDKs do not define TARGET_OS_OSX
# define TARGET_OS_OSX 1
diff --git a/Python/remote_debugging.c b/Python/remote_debugging.c
index 9b2297b5627aa3..1b7311f0ce897b 100644
--- a/Python/remote_debugging.c
+++ b/Python/remote_debugging.c
@@ -20,24 +20,17 @@
# include <sys/mman.h>
#endif
-#if defined(__APPLE__)
-# include <TargetConditionals.h>
-// Older macOS SDKs do not define TARGET_OS_OSX
-# if !defined(TARGET_OS_OSX)
-# define TARGET_OS_OSX 1
-# endif
-# if TARGET_OS_OSX
-# include <libproc.h>
-# include <mach-o/fat.h>
-# include <mach-o/loader.h>
-# include <mach-o/nlist.h>
-# include <mach/mach.h>
-# include <mach/mach_vm.h>
-# include <mach/machine.h>
-# include <sys/mman.h>
-# include <sys/proc.h>
-# include <sys/sysctl.h>
-# endif
+#if defined(__APPLE__) && TARGET_OS_OSX
+# include <libproc.h>
+# include <mach-o/fat.h>
+# include <mach-o/loader.h>
+# include <mach-o/nlist.h>
+# include <mach/mach.h>
+# include <mach/mach_vm.h>
+# include <mach/machine.h>
+# include <sys/mman.h>
+# include <sys/proc.h>
+# include <sys/sysctl.h>
#endif
#ifdef MS_WINDOWS
@@ -65,6 +58,8 @@
# define HAVE_PROCESS_VM_READV 0
#endif
+#if defined(Py_REMOTE_DEBUG) && defined(Py_SUPPORTS_REMOTE_DEBUG)
+
// Define a platform-independent process handle structure
typedef struct {
pid_t pid;
@@ -101,8 +96,6 @@ cleanup_proc_handle(proc_handle_t *handle) {
handle->pid = 0;
}
-#if defined(Py_REMOTE_DEBUG) && defined(Py_SUPPORTS_REMOTE_DEBUG)
-
#if defined(__APPLE__) && TARGET_OS_OSX
static uintptr_t
return_section_address(
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
