<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/ccc99f9f0d58ef6b5d51991cbbf4537568e79166">https://github.com/macports/macports-legacy-support/commit/ccc99f9f0d58ef6b5d51991cbbf4537568e79166</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ccc99f9f0d58ef6b5d51991cbbf4537568e79166
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Sat Feb 15 00:28:54 2025 -0800
<span style='display:block; white-space:pre;color:#404040;'> Fix references to undefined macros.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Referencing undefined macros causes warnings if -Wundef is given,
</span><span style='display:block; white-space:pre;color:#404040;'> possibly even causing client build failures if a client does that, and
</span><span style='display:block; white-space:pre;color:#404040;'> also enables -Werror. Although only the header cases affect clients,
</span><span style='display:block; white-space:pre;color:#404040;'> we fix the library and test sources as well, so that we can safely do
</span><span style='display:block; white-space:pre;color:#404040;'> all builds with the -Wundef option to catch such cases.
</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;'> All tests pass with -Wundef and no undef warnings.
</span>---
include/math.h | 4 ++--
include/sys/cdefs.h | 4 ++--
src/getdelim.c | 4 ++--
src/getdelim.h | 3 +--
src/getline.h | 3 +--
src/memstream.c | 2 +-
test/test_stat.c | 2 +-
7 files changed, 10 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/math.h b/include/math.h
</span><span style='display:block; white-space:pre;color:#808080;'>index e369a0f..73e18c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/math.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/math.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,9 +36,9 @@ __MP__BEGIN_DECLS
</span>
/*
* this is the same condition that defines the function prototypes in
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * the GCC <math.h>.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * the GCC <math.h>, except for the added defined() check to avoid warnings.
</span> */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if !(__DARWIN_NO_LONG_LONG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if !defined(__DARWIN_NO_LONG_LONG) || !__DARWIN_NO_LONG_LONG
</span> extern long long int llrint ( double );
extern long long int llrintf ( float );
extern long long int llrintl ( long double );
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h
</span><span style='display:block; white-space:pre;color:#808080;'>index c786418..a28d470 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/sys/cdefs.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/sys/cdefs.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span> /*
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Copyright (c) 2024 Frederick H. G. Wright II <fw@fwright.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Copyright (c) 2025 Frederick H. G. Wright II <fw@fwright.net>
</span> *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,7 +148,7 @@
</span>
/* Provide any needed and missing symbol versioning (10.4) */
#ifndef __DARWIN_SUF_64_BIT_INO_T
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __DARWIN_64_BIT_INO_T
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if defined(__DARWIN_64_BIT_INO_T) && __DARWIN_64_BIT_INO_T
</span> #define __DARWIN_SUF_64_BIT_INO_T "$INODE64"
#else
#define __DARWIN_SUF_64_BIT_INO_T
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/getdelim.c b/src/getdelim.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 2ce41b3..d607fc0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/getdelim.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/getdelim.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,11 +47,11 @@
</span> #ifndef SSIZE_MAX
# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if !HAVE_FLOCKFILE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if !defined(HAVE_FLOCKFILE) || !HAVE_FLOCKFILE
</span> # undef flockfile
# define flockfile(x) ((void) 0)
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if !HAVE_FUNLOCKFILE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if !defined(HAVE_FUNLOCKFILE) || !HAVE_FUNLOCKFILE
</span> # undef funlockfile
# define funlockfile(x) ((void) 0)
#endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/getdelim.h b/src/getdelim.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 2dabee2..2b04d3f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/getdelim.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/getdelim.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /*
* Copyright (c) Ian F. Darwin 1986-1995.
* Software written by Ian F. Darwin and others;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +31,6 @@
</span> # include <stdio.h>
# include <sys/types.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if !HAVE_DECL_GETDELIM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if !defined(HAVE_DECL_GETDELIM) || !HAVE_DECL_GETDELIM
</span> ssize_t getdelim(char **dst, size_t *len, int delimiter, FILE *fp);
#endif /* !HAVE_GETDELIM */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/getline.h b/src/getline.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 9638afc..f841cba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/getline.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/getline.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /*
* Copyright (c) Ian F. Darwin 1986-1995.
* Software written by Ian F. Darwin and others;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +31,6 @@
</span> # include <stdio.h>
# include <sys/types.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if !HAVE_DECL_GETLINE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if !defined(HAVE_DECL_GETLINE) || !HAVE_DECL_GETLINE
</span> ssize_t getline(char **dst, size_t *len, FILE *fp);
#endif /* !HAVE_GETLINE */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/memstream.c b/src/memstream.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 3bb1f5b..5f16809 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/memstream.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/memstream.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@ struct memstream
</span> size_t *sizeloc;
};
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MEMSTREAM_DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if defined(MEMSTREAM_DEBUG) && MEMSTREAM_DEBUG
</span> static void memstream_print(struct memstream *ms)
{
printf("memstream %p {", ms);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/test/test_stat.c b/test/test_stat.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 8f1bafa..fd007cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/test/test_stat.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/test/test_stat.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +109,7 @@ check_copy_std(int link)
</span> /* Don't check atime, since this test may change it. */
assert(ts_equal(&stat_buf.s.s.st_mtimespec, ©->s.s.st_mtimespec));
assert(ts_equal(&stat_buf.s.s.st_ctimespec, ©->s.s.st_ctimespec));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __DARWIN_64_BIT_INO_T
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if defined(__DARWIN_64_BIT_INO_T) && __DARWIN_64_BIT_INO_T
</span> assert(ts_equal(&stat_buf.s.s.st_birthtimespec,
©->s.s.st_birthtimespec));
#endif /* __DARWIN_64_BIT_INO_T */
</pre><pre style='margin:0'>
</pre>