<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-legacy-support.
</pre>
<p><a href="https://github.com/macports/macports-legacy-support/commit/087359e66a5fc3c5598344bc4b34701b36f1b318">https://github.com/macports/macports-legacy-support/commit/087359e66a5fc3c5598344bc4b34701b36f1b318</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 087359e66a5fc3c5598344bc4b34701b36f1b318
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Wed Dec 4 22:44:43 2024 -0800
<span style='display:block; white-space:pre;color:#404040;'> Eliminate specific FDOPENDIR feature flags.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Since fdopendir() is just another "at" call, with the same
</span><span style='display:block; white-space:pre;color:#404040;'> availability as other "at" calls, the mere fact that it doesn't have
</span><span style='display:block; white-space:pre;color:#404040;'> "at" in its name doesn't justify giving it its own separate feature
</span><span style='display:block; white-space:pre;color:#404040;'> flags. This folds it into the general ATCALLS feature flags.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Test pass on all platforms.
</span>---
include/MacportsLegacySupport.h | 9 ++-------
include/dirent.h | 4 ++--
src/dirfuncs_compat.c | 4 ++--
src/fdopendir.c | 4 ++--
test/test_dirfuncs_compat.c | 6 +++---
5 files changed, 11 insertions(+), 16 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 abfcae7..5aa95c8 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;'>@@ -154,14 +154,10 @@
</span> #define __MPLS_SDK_SUPPORT_TIMESPEC_GET__ (__MPLS_SDK_MAJOR < 101500)
#define __MPLS_LIB_SUPPORT_TIMESPEC_GET__ (__MPLS_TARGET_OSVER < 101500)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* "at" calls */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* "at" calls, including fdopendir */
</span> #define __MPLS_SDK_SUPPORT_ATCALLS__ (__MPLS_SDK_MAJOR < 101000)
#define __MPLS_LIB_SUPPORT_ATCALLS__ (__MPLS_TARGET_OSVER < 101000)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* fdopendir */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MPLS_SDK_SUPPORT_FDOPENDIR__ (__MPLS_SDK_MAJOR < 101000)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MPLS_LIB_SUPPORT_FDOPENDIR__ (__MPLS_TARGET_OSVER < 101000)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /* new signature for scandir and alphasort */
#define __MPLS_SDK_SUPPORT_NEW_SCANDIR__ (__MPLS_SDK_MAJOR < 1080)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -326,8 +322,7 @@
</span> #define __MPLS_LIB_SUPPORT_STAT64__ (__MPLS_TARGET_OSVER < 1050)
/* Compound macros, bundling functionality needed by multiple single features. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MPLS_LIB_NEED_BEST_FCHDIR__ (__MPLS_LIB_SUPPORT_FDOPENDIR__ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || __MPLS_LIB_SUPPORT_ATCALLS__ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_NEED_BEST_FCHDIR__ (__MPLS_LIB_SUPPORT_ATCALLS__ \
</span> || __MPLS_LIB_SUPPORT_SETATTRLISTAT__)
#define __MPLS_LIB_SUPPORT_REALPATH_WRAP__ (__MPLS_LIB_SUPPORT_REALPATH_ALLOC__ \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/dirent.h b/include/dirent.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 21e9b0b..dab7566 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/dirent.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/dirent.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@
</span> #if __DARWIN_C_LEVEL >= 200809L
/* fdopendir */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MPLS_SDK_SUPPORT_FDOPENDIR__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_ATCALLS__
</span>
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,7 @@ extern DIR *fdopendir(int fd) __DARWIN_ALIAS_I(fdopendir);
</span>
__MP__END_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MPLS_SDK_SUPPORT_FDOPENDIR__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_SUPPORT_ATCALLS__ */
</span>
/* new signature for scandir and alphasort (optionally) */
#if __MPLS_SDK_SUPPORT_NEW_SCANDIR__
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/dirfuncs_compat.c b/src/dirfuncs_compat.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 114a07e..1bf0c85 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/dirfuncs_compat.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/dirfuncs_compat.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@
</span>
/* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MPLS_LIB_SUPPORT_FDOPENDIR__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_ATCALLS__
</span>
#include "dirfuncs_compat.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,4 +78,4 @@ __mpls_dirfd(DIR *dirp) {
</span> return dirfd(dirp);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MPLS_LIB_SUPPORT_FDOPENDIR__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_ATCALLS__ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/fdopendir.c b/src/fdopendir.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 58c1d3e..d97b6d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/fdopendir.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/fdopendir.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@
</span> * https://linux.die.net/man/3/fdopendir
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MPLS_LIB_SUPPORT_FDOPENDIR__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_ATCALLS__
</span>
/*
* Set up to use ino32 variants where possible. This results in generating
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -223,4 +223,4 @@ fdopendir##isfx##usfx(int fd) \
</span> ALL_VARIANTS
#undef VARIANT_ENT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MPLS_LIB_SUPPORT_FDOPENDIR__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_ATCALLS__ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/test/test_dirfuncs_compat.c b/test/test_dirfuncs_compat.c
</span><span style='display:block; white-space:pre;color:#808080;'>index e9dee88..de9bda4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/test/test_dirfuncs_compat.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/test/test_dirfuncs_compat.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@
</span>
/* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MPLS_LIB_SUPPORT_FDOPENDIR__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_ATCALLS__
</span>
#include "../src/dirfuncs_compat.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +42,8 @@
</span>
#include "test_fdopendir.c"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#else /* !__MPLS_LIB_SUPPORT_FDOPENDIR__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#else /* !__MPLS_LIB_SUPPORT_ATCALLS__ */
</span>
int main(){ return 0; }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* !__MPLS_LIB_SUPPORT_FDOPENDIR__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* !__MPLS_LIB_SUPPORT_ATCALLS__ */
</span></pre><pre style='margin:0'>
</pre>