<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f63743d45cddea047f7759972a5bbc47b2babc8b">https://github.com/macports/macports-ports/commit/f63743d45cddea047f7759972a5bbc47b2babc8b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f63743d45cddea047f7759972a5bbc47b2babc8b
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Thu Sep 12 09:14:39 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> redis: non-functional: amend patches to form preferred by upstream
</span>---
databases/redis/Portfile | 8 ++--
...x-Availability-macros-so-they-actually-wo.patch | 2 +-
...n-functional-follow-same-code-style-for-A.patch | 26 -------------
... 0002-debug.c-do-not-use-arm-code-on-ppc.patch} | 4 +-
...n-functional-drop-redundant-Availability-.patch | 35 -----------------
...3-debug.c-fix-PowerPC-case-in-uc_mcontext.patch | 36 ++++++++++++++++++
...e-brewisms.patch => 0004-Remove-brewisms.patch} | 0
....c-fix-and-simplify-uc_mcontext-for-Apple.patch | 44 ----------------------
8 files changed, 42 insertions(+), 113 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/redis/Portfile b/databases/redis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2ecd9601f35..34910a17c1c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/redis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/redis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,13 +34,11 @@ patchfiles patch-redis.conf.diff \
</span>
# https://github.com/redis/redis/pull/13534
patchfiles-append 0001-config.h-fix-Availability-macros-so-they-actually-wo.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-config.h-non-functional-follow-same-code-style-for-A.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-config.h-non-functional-drop-redundant-Availability-.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0004-debug.c-do-not-use-arm-code-on-ppc.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0005-debug.c-fix-and-simplify-uc_mcontext-for-Apple.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-debug.c-do-not-use-arm-code-on-ppc.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-debug.c-fix-PowerPC-case-in-uc_mcontext.patch
</span>
# ld: warning: directory '/usr/local/opt/openssl/lib' following -L not found
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append 0006-Remove-brewisms.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0004-Remove-brewisms.patch
</span>
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/redis/files/0001-config.h-fix-Availability-macros-so-they-actually-wo.patch b/databases/redis/files/0001-config.h-fix-Availability-macros-so-they-actually-wo.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index d9e6e058b40..045669927a8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/redis/files/0001-config.h-fix-Availability-macros-so-they-actually-wo.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/redis/files/0001-config.h-fix-Availability-macros-so-they-actually-wo.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 73b97f9fece51ef698cacbf10a5c18c938219936 Mon Sep 17 00:00:00 2001
From: Sergey Fedorov <barracuda@macos-powerpc.org>
Date: Wed, 11 Sep 2024 17:49:41 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/5] config.h: fix Availability macros so they actually work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/3] config.h: fix Availability macros so they actually work
</span>
---
src/config.h | 4 ++--
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/redis/files/0002-config.h-non-functional-follow-same-code-style-for-A.patch b/databases/redis/files/0002-config.h-non-functional-follow-same-code-style-for-A.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 98fe41e288e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/redis/files/0002-config.h-non-functional-follow-same-code-style-for-A.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 050443e2e5acb3783e6478a12a8de1300801d9e9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 11 Sep 2024 17:56:32 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/5] config.h: non-functional: follow same code-style for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Availability macros
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/config.h | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/config.h src/config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2fdad7d1c..8db54dc22 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -286,7 +286,7 @@ void setproctitle(const char *fmt, ...);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <kernel/OS.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define redis_set_thread_title(name) rename_thread(find_thread(0), name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if (defined __APPLE__ && defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined (__APPLE__) && defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int pthread_setname_np(const char *name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <pthread.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define redis_set_thread_title(name) pthread_setname_np(name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.46.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/redis/files/0004-debug.c-do-not-use-arm-code-on-ppc.patch b/databases/redis/files/0002-debug.c-do-not-use-arm-code-on-ppc.patch
</span>similarity index 87%
rename from databases/redis/files/0004-debug.c-do-not-use-arm-code-on-ppc.patch
rename to databases/redis/files/0002-debug.c-do-not-use-arm-code-on-ppc.patch
<span style='display:block; white-space:pre;color:#808080;'>index df9f32f1de2..aa4fde93615 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/redis/files/0004-debug.c-do-not-use-arm-code-on-ppc.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/redis/files/0002-debug.c-do-not-use-arm-code-on-ppc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 0cac36b4ee046b19be64ba943cab0fbf525d92a2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d363838fcb4aa1e67eb5337ea74858b2fe1850f6 Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
Date: Wed, 11 Sep 2024 18:06:25 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 4/5] debug.c: do not use arm code on ppc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/3] debug.c: do not use arm code on ppc
</span>
---
src/debug.c | 4 +++-
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/redis/files/0003-config.h-non-functional-drop-redundant-Availability-.patch b/databases/redis/files/0003-config.h-non-functional-drop-redundant-Availability-.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 11a8210854f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/redis/files/0003-config.h-non-functional-drop-redundant-Availability-.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 161c10725a6ff465bc2343bceb9f3d117762e0c5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 11 Sep 2024 17:57:59 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3/5] config.h: non-functional: drop redundant Availability
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macros
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/config.h | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/config.h src/config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8db54dc22..4c02935d8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__) && defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define MAC_OS_10_6_DETECTED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -286,7 +286,7 @@ void setproctitle(const char *fmt, ...);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <kernel/OS.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define redis_set_thread_title(name) rename_thread(find_thread(0), name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined (__APPLE__) && defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined (__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int pthread_setname_np(const char *name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <pthread.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define redis_set_thread_title(name) pthread_setname_np(name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.46.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/redis/files/0003-debug.c-fix-PowerPC-case-in-uc_mcontext.patch b/databases/redis/files/0003-debug.c-fix-PowerPC-case-in-uc_mcontext.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fcbe0620118
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/redis/files/0003-debug.c-fix-PowerPC-case-in-uc_mcontext.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5dc45151360aea12f0c1247455f0d21a0ad8dc64 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 11 Sep 2024 22:33:24 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/3] debug.c: fix PowerPC case in uc_mcontext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/debug.c | 9 +++++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/debug.c src/debug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 78bacc946..c2b6814e1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/debug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/debug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1210,14 +1210,15 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return old_val; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } while(0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__) && !defined(MAC_OS_10_6_DETECTED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* OSX < 10.6 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* OSX on PowerPC */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GET_SET_RETURN(uc->uc_mcontext->__ss.__srr0, eip);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__) && !defined(MAC_OS_10_6_DETECTED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* OSX < 10.6 on x86 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__x86_64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GET_SET_RETURN(uc->uc_mcontext->__ss.__rip, eip);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__i386__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GET_SET_RETURN(uc->uc_mcontext->__ss.__eip, eip);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GET_SET_RETURN(uc->uc_mcontext->__ss.__srr0, eip);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__APPLE__) && defined(MAC_OS_10_6_DETECTED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* OSX >= 10.6 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/redis/files/0006-Remove-brewisms.patch b/databases/redis/files/0004-Remove-brewisms.patch
</span>similarity index 100%
rename from databases/redis/files/0006-Remove-brewisms.patch
rename to databases/redis/files/0004-Remove-brewisms.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/redis/files/0005-debug.c-fix-and-simplify-uc_mcontext-for-Apple.patch b/databases/redis/files/0005-debug.c-fix-and-simplify-uc_mcontext-for-Apple.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 41858c7b24f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/redis/files/0005-debug.c-fix-and-simplify-uc_mcontext-for-Apple.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 366f3fa68cad44188ac8245020b663d29cf557ea Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 11 Sep 2024 18:16:35 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 5/5] debug.c: fix and simplify uc_mcontext for Apple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/debug.c | 18 ++++++------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 6 insertions(+), 12 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/debug.c src/debug.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 78bacc946..a7b885068 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/debug.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/debug.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1210,21 +1210,15 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return old_val; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } while(0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__) && !defined(MAC_OS_10_6_DETECTED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* OSX < 10.6 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #if defined(__x86_64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GET_SET_RETURN(uc->uc_mcontext->__ss.__rip, eip);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #elif defined(__i386__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GET_SET_RETURN(uc->uc_mcontext->__ss.__eip, eip);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* OSX PowerPC */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GET_SET_RETURN(uc->uc_mcontext->__ss.__srr0, eip);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__APPLE__) && defined(MAC_OS_10_6_DETECTED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* OSX >= 10.6 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #if defined(_STRUCT_X86_THREAD_STATE64) && !defined(__i386__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GET_SET_RETURN(uc->uc_mcontext->__ss.__rip, eip);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* OSX x86 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__i386__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GET_SET_RETURN(uc->uc_mcontext->__ss.__eip, eip);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #elif defined(__x86_64__) || defined(_STRUCT_X86_THREAD_STATE64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GET_SET_RETURN(uc->uc_mcontext->__ss.__rip, eip);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* OSX ARM64 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *old_val = (void*)arm_thread_state64_get_pc(uc->uc_mcontext->__ss);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.46.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>