<pre style='margin:0'>
Ken (kencu) pushed a commit to branch testnewheaders
in repository macports-legacy-support.
</pre>
<p><a href="https://github.com/macports/macports-legacy-support/commit/37fb38c36fe40e9620961fbaa528fe1ca42677a5">https://github.com/macports/macports-legacy-support/commit/37fb38c36fe40e9620961fbaa528fe1ca42677a5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 37fb38c36fe40e9620961fbaa528fe1ca42677a5
</span>Author: ken-cunningham-webuse <ken.cunningham.webuse@gmail.com>
AuthorDate: Mon Jan 28 15:19:54 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> condense headers to simplify logic
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> add new define __DISABLE_ALL_MACPORTS_FUNCTION_WRAPPING__
</span><span style='display:block; white-space:pre;color:#404040;'> that turns off all wrapped functions for debugging purposes
</span>---
include/MacportsLegacySupport.h | 41 ++++++++++++++++++++++-------------------
include/stdlib.h | 6 +-----
include/unistd.h | 4 ----
3 files changed, 23 insertions(+), 28 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 5201cea..92bc4f3 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;'>@@ -24,49 +24,52 @@
</span> /* defines for when legacy support is required for various functions */
/* clock_gettime */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_GETTIME__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MP_LEGACY_SUPPORT_GETTIME__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* **at */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MP_LEGACY_SUPPORT_ATCALLS__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101000)
</span>
/* strnlen */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_STRNLEN__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MP_LEGACY_SUPPORT_STRNLEN__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
</span>
/* strndup */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_STRNDUP__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MP_LEGACY_SUPPORT_STRNDUP__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
</span>
/* getline */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_GETLINE__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MP_LEGACY_SUPPORT_GETLINE__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
</span>
/* memmem */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_MEMMEM__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MP_LEGACY_SUPPORT_MEMMEM__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
</span>
/* wcsdup */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_WCSDUP__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MP_LEGACY_SUPPORT_WCSDUP__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
</span>
/* wcsnlen */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_WCSNLEN__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MP_LEGACY_SUPPORT_WCSNLEN__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
</span>
/* wcpcpy, wcpncpy */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_WCPCPY__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MP_LEGACY_SUPPORT_WCPCPY__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
</span>
/* wcsncasecmp_l, wcscasecmp_l, wcsncasecmp, wcscasecmp */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_WCSCASECMP__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MP_LEGACY_SUPPORT_WCSCASECMP__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
</span>
/* llround */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_LLROUND__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MP_LEGACY_SUPPORT_LLROUND__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* **at */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_ATCALLS__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101000)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/* lsmod */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_LSMOD__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050)
</span>
/* posix_memalign */
#define __MP_LEGACY_SUPPORT_POSIX_MEMALIGN__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1060)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* sysconf() wrap */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_SYSCONF_WRAP__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /* realpath() wrap */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_REALPATH_WRAP__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1060)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MP_LEGACY_SUPPORT_REALPATH_WRAP__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1060 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && !__BUILDING_MP_LEGACY_SUPPORT_REALPATH_WRAP__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && !__DISABLE_ALL_MACPORTS_FUNCTION_WRAPPING__ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* lsmod */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MP_LEGACY_SUPPORT_LSMOD__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050)
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+/* sysconf() wrap */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MP_LEGACY_SUPPORT_SYSCONF_WRAP__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && !__BUILDING_MP_LEGACY_SUPPORT_SYSCONF_WRAP__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && !__DISABLE_ALL_MACPORTS_FUNCTION_WRAPPING__ )
</span>
#endif /* _MACPORTS_LEGACYSUPPORTDEFS_H_ */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/stdlib.h b/include/stdlib.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 735b54d..a5136cd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/stdlib.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/stdlib.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,14 +25,11 @@
</span>
/* realpath wrap */
#if __MP_LEGACY_SUPPORT_REALPATH_WRAP__
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* we need a way to isolate ourselves from our header wrapping while building */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef __BUILDING_MP_LEGACY_SUPPORT_REALPATH_WRAP__
</span>
/* we are going to move the old realpath definition out of the way */
#undef realpath
#define realpath realpath_macports_original
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /*__BUILDING_MP_LEGACY_SUPPORT_REALPATH_WRAP__ */
</span> #endif /*__MP_LEGACY_SUPPORT_REALPATH_WRAP__*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +39,6 @@
</span>
/* realpath wrap */
#if __MP_LEGACY_SUPPORT_REALPATH_WRAP__
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef __BUILDING_MP_LEGACY_SUPPORT_REALPATH_WRAP__
</span>
/* and now define realpath as our new wrapped function */
#undef realpath
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +51,7 @@ extern "C" {
</span> #ifdef __cplusplus
}
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /*__BUILDING_MP_LEGACY_SUPPORT_REALPATH_WRAP__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #endif /*__MP_LEGACY_SUPPORT_REALPATH_WRAP__*/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/unistd.h b/include/unistd.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 527d2df..7820323 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/unistd.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/unistd.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,13 +3,11 @@
</span>
#if __MP_LEGACY_SUPPORT_SYSCONF_WRAP__
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef __BUILDING_MP_LEGACY_SUPPORT_SYSCONF_WRAP__
</span>
/* redefine the original sysconf */
#undef sysconf
#define sysconf sysconf_orig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __BUILDING_MP_LEGACY_SUPPORT_SYSCONF_WRAP__ */
</span> #endif /*__MP_LEGACY_SUPPORT_SYSCONF_WRAP__*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +17,6 @@
</span>
#if __MP_LEGACY_SUPPORT_SYSCONF_WRAP__
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef __BUILDING_MP_LEGACY_SUPPORT_SYSCONF_WRAP__
</span>
/* and now define sysconf as our new wrapped function */
#undef sysconf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,5 +38,4 @@ extern long macports_legacy_sysconf(int);
</span> }
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __BUILDING_MP_LEGACY_SUPPORT_SYSCONF_WRAP__ */
</span> #endif /*__MP_LEGACY_SUPPORT_SYSCONF_WRAP__*/
</pre><pre style='margin:0'>
</pre>