<pre style='margin:0'>
Ken (kencu) pushed a commit to branch fsgetpath
in repository macports-legacy-support.
</pre>
<p><a href="https://github.com/macports/macports-legacy-support/commit/65cb092a220e951fbcc122d53fc54cb00ea674a5">https://github.com/macports/macports-legacy-support/commit/65cb092a220e951fbcc122d53fc54cb00ea674a5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 65cb092a220e951fbcc122d53fc54cb00ea674a5
</span>Author: ken-cunningham-webuse <ken.cunningham.webuse@gmail.com>
AuthorDate: Mon Sep 30 22:09:00 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> wrap all functions in #ifndef's
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> to avoid the problem where a newer SDK is used with an older
</span><span style='display:block; white-space:pre;color:#404040;'> deployment target, thereby causing function name redefinitions
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> the alternative, to use MAC_OS_X_VERSION_MAX_ALLOWED and have duplicate
</span><span style='display:block; white-space:pre;color:#404040;'> symbol tests for the defines and the library implementation, was
</span><span style='display:block; white-space:pre;color:#404040;'> percieved to be just too cumbersome.
</span>---
include/dirent.h | 2 ++
include/stdio.h | 8 +++++++-
include/stdlib.h | 6 ++++++
include/string.h | 9 +++++++--
include/sys/fcntl.h | 4 ++--
include/sys/stat.h | 4 ++++
include/sys/unistd.h | 15 ++++++++++++++-
include/wchar.h | 12 ++++++++++++
include/xlocale/_wchar.h | 4 ++++
9 files changed, 58 insertions(+), 6 deletions(-)
<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 f964ac2..8555dd2 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;'>@@ -27,7 +27,9 @@
</span> /* fdopendir */
#if __MP_LEGACY_SUPPORT_FDOPENDIR__
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef fdopendir
</span> extern DIR *fdopendir(int fd);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span> __MP__END_DECLS
#endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/stdio.h b/include/stdio.h
</span><span style='display:block; white-space:pre;color:#808080;'>index d6e95be..3dd3e36 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/stdio.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/stdio.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,8 +43,12 @@ typedef __darwin_ssize_t ssize_t;
</span> #endif
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef getdelim
</span> extern ssize_t getdelim(char **lineptr, size_t *n, int delimiter, FILE *fp);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-extern ssize_t getline (char **lineptr, size_t *n, FILE *stream);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef getline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extern ssize_t getline(char **lineptr, size_t *n, FILE *stream);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span> __MP__END_DECLS
#endif /* __MP_LEGACY_SUPPORT_GETLINE__ */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +71,9 @@ typedef __darwin_ssize_t ssize_t;
</span> #endif
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef renameat
</span> extern int renameat(int olddirfd, const char *oldpath, int newdirfd, const char *newpath);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span> __MP__END_DECLS
#endif /* __MP_LEGACY_SUPPORT_ATCALLS__ */
<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 8dde01e..aa2ee4a 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;'>@@ -65,7 +65,9 @@ typedef __darwin_ssize_t ssize_t;
</span> #endif
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef posix_memalign
</span> extern int posix_memalign(void **memptr, size_t alignment, size_t size);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span> __MP__END_DECLS
#endif /* __MP_LEGACY_SUPPORT_POSIX_MEMALIGN__ */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,14 +89,18 @@ typedef unsigned int uint32_t;
</span> * upper bound of 'upper_bound'
*/
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef arc4random_uniform
</span> extern uint32_t arc4random_uniform( uint32_t upper_bound );
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span> __MP__END_DECLS
/*
* Generate 'n' random bytes and put them in 'buf'.
*/
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef arc4random_buf
</span> extern void arc4random_buf( void* buf, size_t n );
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span> __MP__END_DECLS
#endif /* __MP_LEGACY_SUPPORT_ARC4RANDOM__ */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/string.h b/include/string.h
</span><span style='display:block; white-space:pre;color:#808080;'>index c2be8b4..2198ffd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/string.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/string.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,22 +27,27 @@
</span> /* strnlen */
#if __MP_LEGACY_SUPPORT_STRNLEN__
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef strnlen
</span> extern size_t strnlen(const char *s, size_t maxlen);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span> __MP__END_DECLS
#endif
/* strndup */
#if __MP_LEGACY_SUPPORT_STRNDUP__
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef strndup
</span> extern char *strndup(const char *s, size_t n);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span> __MP__END_DECLS
#endif
/* memmem */
#if __MP_LEGACY_SUPPORT_MEMMEM__
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-extern void *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-memmem(const void *l, size_t l_len, const void *s, size_t s_len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef memmem
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extern void *memmem(const void *l, size_t l_len, const void *s, size_t s_len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span> __MP__END_DECLS
#endif
<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 98d16e0..e456769 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;'>@@ -55,9 +55,9 @@
</span> #endif
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef openat
</span> extern int openat(int dirfd, const char *pathname, int flags, ...);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span> __MP__END_DECLS
#endif /* __MP_LEGACY_SUPPORT_ATCALLS__ */
<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 cbb9b85..b629afb 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;'>@@ -35,8 +35,10 @@ extern int fstatat(int dirfd, const char *pathname, struct stat *buf, int flags)
</span> /* 64bit inode types appeared only on 10.5, and currently can't be replaced on Tiger */
/* due to lack of kernel support for the underlying syscalls */
#if !__DARWIN_ONLY_64_BIT_INO_T && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef fstatat64
</span> extern int fstatat64(int dirfd, const char *pathname, struct stat64 *buf, int flags);
#endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span>
extern int mkdirat(int dirfd, const char *pathname, mode_t mode);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +50,9 @@ __MP__END_DECLS
</span>
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef lchmod
</span> extern int lchmod(const char *, mode_t);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span>
__MP__END_DECLS
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/sys/unistd.h b/include/sys/unistd.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 8e11880..2b14141 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/sys/unistd.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/sys/unistd.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,15 +52,28 @@ typedef __darwin_gid_t gid_t;
</span> #endif
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef getattrlistat
</span> extern int getattrlistat(int dirfd, const char *pathname, struct attrlist *a,
void *buf, size_t size, unsigned long flags);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef readlinkat
</span> extern ssize_t readlinkat(int dirfd, const char *pathname, char *buf, size_t bufsiz);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifned faccessat
</span> extern int faccessat(int dirfd, const char *pathname, int mode, int flags);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef fchownat
</span> extern int fchownat(int dirfd, const char *pathname, uid_t owner, gid_t group, int flags);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef linkat
</span> extern int linkat(int olddirfd, const char *oldpath, int newdirfd, const char *newpath, int flags);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef symlinkat
</span> extern int symlinkat(const char *oldpath, int newdirfd, const char *newpath);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef unlinkat
</span> extern int unlinkat(int dirfd, const char *pathname, int flags);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span>
__MP__END_DECLS
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/wchar.h b/include/wchar.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 99c5edb..dcb34d5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/wchar.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/wchar.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,25 +28,37 @@ __MP__BEGIN_DECLS
</span>
/* wcsdup */
#if __MP_LEGACY_SUPPORT_WCSDUP__
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef wcsdup
</span> extern wchar_t * wcsdup(const wchar_t *s);
#endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span>
/* wcsnlen */
#if __MP_LEGACY_SUPPORT_WCSNLEN__
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef wcsnlen
</span> extern size_t wcsnlen(const wchar_t *, size_t);
#endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span>
/* wcpcpy, wcpncpy */
#if __MP_LEGACY_SUPPORT_WCPCPY__
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef wcpcpy
</span> extern wchar_t * wcpcpy(wchar_t *__restrict d, const wchar_t *__restrict s);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef wcpncpy
</span> extern wchar_t *wcpncpy(wchar_t *__restrict d, const wchar_t *__restrict s, size_t n);
#endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span>
/* wcsncasecmp, wcscasecmp */
#if __MP_LEGACY_SUPPORT_WCSCASECMP__
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef wcscasecmp
</span> extern int wcscasecmp(const wchar_t *l, const wchar_t *r);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef wcsncasecmp
</span> extern int wcsncasecmp(const wchar_t *l, const wchar_t *r, size_t n);
#endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span>
__MP__END_DECLS
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/xlocale/_wchar.h b/include/xlocale/_wchar.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 31183d6..9222ebe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/xlocale/_wchar.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/xlocale/_wchar.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,8 +27,12 @@
</span> /* wcsncasecmp_l, wcscasecmp_l */
#if __MP_LEGACY_SUPPORT_WCSCASECMP__
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef wcscasecmp_l
</span> extern int wcscasecmp_l(const wchar_t *l, const wchar_t *r, locale_t locale);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef wcsncasecmp_l
</span> extern int wcsncasecmp_l(const wchar_t *l, const wchar_t *r, size_t n, locale_t locale);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span> __MP__END_DECLS
#endif
</pre><pre style='margin:0'>
</pre>