<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/ca584e03838d67003285e818dd859faecaba756f">https://github.com/macports/macports-legacy-support/commit/ca584e03838d67003285e818dd859faecaba756f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ca584e03838d67003285e818dd859faecaba756f
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Fri Jun 28 19:10:29 2024 -0700
<span style='display:block; white-space:pre;color:#404040;'> Remove superfluous ifndefs from some headers.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Some constant definitions were wrapped in #ifndef/#endif to defend
</span><span style='display:block; white-space:pre;color:#404040;'> against the possibility of building with a later SDK that provided
</span><span style='display:block; white-space:pre;color:#404040;'> those definitions. But in cases where a proper SDK version
</span><span style='display:block; white-space:pre;color:#404040;'> conditional is used, this is redundant.
</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;'> Builds and passes tests on all platforms, including with allowable
</span><span style='display:block; white-space:pre;color:#404040;'> mismatched SDK cases.
</span>---
include/sys/fcntl.h | 14 ++------------
include/sys/stat.h | 5 -----
include/time.h | 21 ---------------------
3 files changed, 2 insertions(+), 38 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/sys/fcntl.h b/include/sys/fcntl.h
</span><span style='display:block; white-space:pre;color:#808080;'>index a3cedd5..c97118b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/sys/fcntl.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/sys/fcntl.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@
</span> /* Include the primary system sys/fcntl.h */
#include_next <sys/fcntl.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* replace missing O_CLOEXEC definition with 0, which works
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* replace missing (<10.7) O_CLOEXEC definition with 0, which works
</span> * but does not replace the full function of that flag
* this is the commonly done fix in MacPorts (see gtk3, for example)
* FIXME - this could use a proper fix, if possible
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,21 +39,11 @@
</span> /* atcalls */
#if __MPLS_SDK_SUPPORT_ATCALLS__
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef AT_FDCWD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define AT_FDCWD -2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef AT_EACCESS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define AT_FDCWD -2 /*Descriptor value for the current working directory */
</span> #define AT_EACCESS 0x0010 /* Use effective ids in access check */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef AT_SYMLINK_NOFOLLOW
</span> #define AT_SYMLINK_NOFOLLOW 0x0020 /* Act on the symlink itself not the target */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef AT_SYMLINK_FOLLOW
</span> #define AT_SYMLINK_FOLLOW 0x0040 /* Act on target of symlink */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef AT_REMOVEDIR
</span> #define AT_REMOVEDIR 0x0080 /* Path refers to directory */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span>
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/sys/stat.h b/include/sys/stat.h
</span><span style='display:block; white-space:pre;color:#808080;'>index c28bdd2..fcba910 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/sys/stat.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/sys/stat.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,13 +28,8 @@
</span>
#if __MPLS_SDK_SUPPORT_UTIMENSAT__
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if !defined(UTIME_NOW)
</span> #define UTIME_NOW -1
<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(UTIME_OMIT)
</span> #define UTIME_OMIT -2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span>
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/time.h b/include/time.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 62399c4..15e6946 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/time.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/time.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,35 +50,14 @@ __MP__END_DECLS
</span> typedef int clockid_t;
#endif /* !defined(CLOCK_REALTIME) && !defined(CLOCK_MONOTONIC) */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef CLOCK_REALTIME
</span> #define CLOCK_REALTIME 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef CLOCK_MONOTONIC
</span> #define CLOCK_MONOTONIC 6
<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;'>-#ifndef CLOCK_MONOTONIC_RAW
</span> #define CLOCK_MONOTONIC_RAW 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef CLOCK_MONOTONIC_RAW_APPROX
</span> #define CLOCK_MONOTONIC_RAW_APPROX 5
<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;'>-#ifndef CLOCK_UPTIME_RAW
</span> #define CLOCK_UPTIME_RAW 8
<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;'>-#ifndef CLOCK_UPTIME_RAW_APPROX
</span> #define CLOCK_UPTIME_RAW_APPROX 9
<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;'>-#ifndef CLOCK_PROCESS_CPUTIME_ID
</span> #define CLOCK_PROCESS_CPUTIME_ID 12
<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;'>-#ifndef CLOCK_THREAD_CPUTIME_ID
</span> #define CLOCK_THREAD_CPUTIME_ID 16
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span>
__MP__BEGIN_DECLS
</pre><pre style='margin:0'>
</pre>