<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-legacy-support.
</pre>
<p><a href="https://github.com/macports/macports-legacy-support/commit/4453ec506c1ddfabdf46321b94abc08559b339e4">https://github.com/macports/macports-legacy-support/commit/4453ec506c1ddfabdf46321b94abc08559b339e4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4453ec506c1ddfabdf46321b94abc08559b339e4
</span>Author: Ken Cunningham <ken.cunningham.webuse@gmail.com>
AuthorDate: Mon Feb 15 10:13:28 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> Revert "include: support undefined __DISABLE_MP_LEGACY_SUPPORT_FUNCTION_WRAPPING__, __DISABLE_MP_LEGACY_SUPPORT_REALPATH_WRAP__ and __DISABLE_MP_LEGACY_SUPPORT_SYSCONF_WRAP__."
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This reverts commit c3a122a4e187cf303f3aaf3edc427d3bab3e17a5.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> this wound up causing more warnings than it suppressed, and then
</span><span style='display:block; white-space:pre;color:#404040;'> fixes to try to fix the fixes caused segfaults
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> If there are spurious warnings coming from the legacysupport headers, we
</span><span style='display:block; white-space:pre;color:#404040;'> will try to sort them all out in one commit at some point, or
</span><span style='display:block; white-space:pre;color:#404040;'> perhaps suppressed them with the gcc/clang system_headers pragmas,
</span><span style='display:block; white-space:pre;color:#404040;'> which (hopefully) won't cause even more warnings when they are used.
</span>---
include/MacportsLegacySupport.h | 8 ++++----
include/MacportsLegacyWrappers/wrapper_macros.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/MacportsLegacySupport.h b/include/MacportsLegacySupport.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 7589497..5f3e5c8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/MacportsLegacySupport.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/MacportsLegacySupport.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,8 +92,8 @@
</span> #define __MP_LEGACY_SUPPORT_REALPATH_WRAP__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1060)
/* realpath() wrap has bail-out macros in case we want to disable only function wrapping */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __ENABLE_MP_LEGACY_SUPPORT_REALPATH_WRAP__ ((!defined (__DISABLE_MP_LEGACY_SUPPORT_FUNCTION_WRAPPING__) || !__DISABLE_MP_LEGACY_SUPPORT_FUNCTION_WRAPPING__) && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (!defined (__DISABLE_MP_LEGACY_SUPPORT_REALPATH_WRAP__) || !__DISABLE_MP_LEGACY_SUPPORT_REALPATH_WRAP__) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __ENABLE_MP_LEGACY_SUPPORT_REALPATH_WRAP__ (!__DISABLE_MP_LEGACY_SUPPORT_FUNCTION_WRAPPING__ && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !__DISABLE_MP_LEGACY_SUPPORT_REALPATH_WRAP__ && \
</span> __MP_LEGACY_SUPPORT_REALPATH_WRAP__)
/* lsmod does not exist on Tiger */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,8 +109,8 @@
</span> #define __MP_LEGACY_SUPPORT_SYSCONF_WRAP__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101100)
/* sysconf() wrap has bail-out macros in case we want to disable only function wrapping */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __ENABLE_MP_LEGACY_SUPPORT_SYSCONF_WRAP__ ((!defined (__DISABLE_MP_LEGACY_SUPPORT_FUNCTION_WRAPPING__) || !__DISABLE_MP_LEGACY_SUPPORT_FUNCTION_WRAPPING__) && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (!defined (__DISABLE_MP_LEGACY_SUPPORT_SYSCONF_WRAP__) || !__DISABLE_MP_LEGACY_SUPPORT_SYSCONF_WRAP__) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __ENABLE_MP_LEGACY_SUPPORT_SYSCONF_WRAP__ (!__DISABLE_MP_LEGACY_SUPPORT_FUNCTION_WRAPPING__ && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !__DISABLE_MP_LEGACY_SUPPORT_SYSCONF_WRAP__ && \
</span> __MP_LEGACY_SUPPORT_SYSCONF_WRAP__)
/* pthread_rwlock_initializer is not defined on Tiger */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/MacportsLegacyWrappers/wrapper_macros.h b/include/MacportsLegacyWrappers/wrapper_macros.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 71ae381..981bb5a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/MacportsLegacyWrappers/wrapper_macros.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/MacportsLegacyWrappers/wrapper_macros.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@
</span> #define __DISABLE_MP_LEGACY_SUPPORT_FUNCTION_WRAPPING__ 1
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if !defined (__DISABLE_MP_LEGACY_SUPPORT_FUNCTION_WRAPPING__) || !__DISABLE_MP_LEGACY_SUPPORT_FUNCTION_WRAPPING__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if !__DISABLE_MP_LEGACY_SUPPORT_FUNCTION_WRAPPING__
</span> /* Could include Darwin's <sys/cdefs.h> and use __STRING, __CONCAT */
/* But for wrappers we require __asm, thus GCC/Clang, thus ANSI C, anyway */
</pre><pre style='margin:0'>
</pre>