<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/042b096f96bf4ade801b8bf1c734f812c202173c">https://github.com/macports/macports-legacy-support/commit/042b096f96bf4ade801b8bf1c734f812c202173c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 042b096f96bf4ade801b8bf1c734f812c202173c
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Mon Jul 1 14:39:37 2024 -0700
<span style='display:block; white-space:pre;color:#404040;'> Convert some feature flags to the new scheme.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This reworks the flags that interact with __DARWIN_C_LEVEL
</span><span style='display:block; white-space:pre;color:#404040;'> conditionals, to allow proper testing with different SDKs.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Re: https://trac.macports.org/ticket/69867
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also fixes a warning and cleans up some whitespace in sys/stat.h.
</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/MacportsLegacySupport.h | 80 +++++++++++++++++++++++-------------
include/dirent.h | 8 ++--
include/stdio.h | 19 +++++----
include/string.h | 12 +++---
include/strings.h | 13 +++---
include/sys/fcntl.h | 7 +++-
include/sys/stat.h | 27 ++++++++----
include/sys/stdio.h | 4 +-
include/sys/unistd.h | 18 ++++----
include/time.h | 8 ++--
include/unistd.h | 7 +++-
include/wchar.h | 12 +++---
include/xlocale/_wchar.h | 12 +++---
src/add_symbols.c | 4 +-
src/atcalls.c | 4 +-
src/best_fchdir.c | 7 ++--
src/common-priv.h | 24 +++++------
src/dirfuncs_compat.c | 4 +-
src/dprintf.c | 4 +-
src/fdopendir.c | 5 +--
src/fmemopen.c | 4 +-
src/fsetattrlist.c | 5 ++-
src/getdelim.c | 7 ++--
src/getline.c | 7 ++--
src/macports_legacy_symbol_aliases.c | 4 +-
src/memmem.c | 7 ++--
src/memstream.c | 4 +-
src/setattrlistat.c | 6 +--
src/strings.c | 13 +++---
src/strndup.c | 5 +--
src/strnlen.c | 5 +--
src/time.c | 9 ++--
src/utimensat.c | 4 +-
src/wcpcpy_family.c | 6 +--
src/wcscasecmp_family.c | 6 +--
src/wcsdup.c | 8 ++--
src/wcsnlen.c | 4 +-
test/test_dirfuncs_compat.c | 6 +--
38 files changed, 217 insertions(+), 172 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 82bcf35..d1c8ae7 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;'>@@ -112,23 +112,29 @@
</span> /* fsgetpath */
#define __MP_LEGACY_SUPPORT_FSGETPATH__ (__MPLS_TARGET_OSVER < 101300)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* **setattrlistat */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_SETATTRLISTAT__ (__MPLS_TARGET_OSVER < 101300)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* setattrlistat */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_SETATTRLISTAT__ (__MPLS_SDK_MAJOR < 101300)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_SETATTRLISTAT__ (__MPLS_TARGET_OSVER < 101300)
</span>
/* ** utimensat, futimens, UTIME_NOW, UTIME_OMIT */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_UTIMENSAT__ (__MPLS_TARGET_OSVER < 101300)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_UTIMENSAT__ (__MPLS_SDK_MAJOR < 101300)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_UTIMENSAT__ (__MPLS_TARGET_OSVER < 101300)
</span>
/* clock_gettime */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_GETTIME__ (__MPLS_TARGET_OSVER < 101200)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_GETTIME__ (__MPLS_SDK_MAJOR < 101200)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_GETTIME__ (__MPLS_TARGET_OSVER < 101200)
</span>
/* timespec_get */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_TIMESPEC_GET__ (__MPLS_TARGET_OSVER < 101500)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_TIMESPEC_GET__ (__MPLS_SDK_MAJOR < 101500)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_TIMESPEC_GET__ (__MPLS_TARGET_OSVER < 101500)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* **at calls */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_ATCALLS__ (__MPLS_TARGET_OSVER < 101000)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* "at" calls */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_ATCALLS__ (__MPLS_SDK_MAJOR < 101000)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_ATCALLS__ (__MPLS_TARGET_OSVER < 101000)
</span>
/* fdopendir */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_FDOPENDIR__ (__MPLS_TARGET_OSVER < 101000)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_FDOPENDIR__ (__MPLS_SDK_MAJOR < 101000)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_FDOPENDIR__ (__MPLS_TARGET_OSVER < 101000)
</span>
/* <net/if.h> include <sys/socket.h> */
#define __MPLS_SDK_NETIF_SOCKET_FIX__ (__MPLS_SDK_MAJOR < 1090)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,31 +147,40 @@
</span> #define __MPLS_LIB_SUPPORT_STPNCPY__ (__MPLS_TARGET_OSVER < 1070)
/* strnlen */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_STRNLEN__ (__MPLS_TARGET_OSVER < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_STRNLEN__ (__MPLS_SDK_MAJOR < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_STRNLEN__ (__MPLS_TARGET_OSVER < 1070)
</span>
/* strndup */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_STRNDUP__ (__MPLS_TARGET_OSVER < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_STRNDUP__ (__MPLS_SDK_MAJOR < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_STRNDUP__ (__MPLS_TARGET_OSVER < 1070)
</span>
/* dprintf */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_DPRINTF__ (__MPLS_TARGET_OSVER < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_DPRINTF__ (__MPLS_SDK_MAJOR < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_DPRINTF__ (__MPLS_TARGET_OSVER < 1070)
</span>
/* getline */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_GETLINE__ (__MPLS_TARGET_OSVER < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_GETLINE__ (__MPLS_SDK_MAJOR < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_GETLINE__ (__MPLS_TARGET_OSVER < 1070)
</span>
/* memmem */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_MEMMEM__ (__MPLS_TARGET_OSVER < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_MEMMEM__ (__MPLS_SDK_MAJOR < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_MEMMEM__ (__MPLS_TARGET_OSVER < 1070)
</span>
/* wcsdup */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_WCSDUP__ (__MPLS_TARGET_OSVER < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_WCSDUP__ (__MPLS_SDK_MAJOR < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_WCSDUP__ (__MPLS_TARGET_OSVER < 1070)
</span>
/* wcsnlen */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_WCSNLEN__ (__MPLS_TARGET_OSVER < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_WCSNLEN__ (__MPLS_SDK_MAJOR < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_WCSNLEN__ (__MPLS_TARGET_OSVER < 1070)
</span>
/* wcpcpy, wcpncpy */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_WCPCPY__ (__MPLS_TARGET_OSVER < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_WCPCPY__ (__MPLS_SDK_MAJOR < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_WCPCPY__ (__MPLS_TARGET_OSVER < 1070)
</span>
/* wcsncasecmp_l, wcscasecmp_l, wcsncasecmp, wcscasecmp */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_WCSCASECMP__ (__MPLS_TARGET_OSVER < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_WCSCASECMP__ (__MPLS_SDK_MAJOR < 1070)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_WCSCASECMP__ (__MPLS_TARGET_OSVER < 1070)
</span>
/* llround */
#define __MP_LEGACY_SUPPORT_LLROUND__ (__MPLS_TARGET_OSVER < 1070)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,8 +201,9 @@
</span> /* realpath() on < 1060 does not support modern NULL buffer usage */
#define __MP_LEGACY_SUPPORT_REALPATH_WRAP__ (__MPLS_TARGET_OSVER < 1060)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* setattrlistat */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_FSETATTRLIST__ (__MPLS_TARGET_OSVER < 1060)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* setattrlist */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_FSETATTRLIST__ (__MPLS_SDK_MAJOR < 1060)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_FSETATTRLIST__ (__MPLS_TARGET_OSVER < 1060)
</span>
/* localtime_r, gmtime_r, etc only declared on Tiger when _ANSI_SOURCE and _POSIX_C_SOURCE are undefined */
#define __MPLS_SDK_SUPPORT_TIME_THREAD_SAFE_FUNCTIONS__ (__MPLS_SDK_MAJOR < 1050)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -224,30 +240,38 @@
</span> #define __MP_LEGACY_SUPPORT_COSSIN__ (__MPLS_TARGET_OSVER < 1090)
/* ffsl */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_FFSL__ (__MPLS_TARGET_OSVER < 1050)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_FFSL__ (__MPLS_SDK_MAJOR < 1050)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_FFSL__ (__MPLS_TARGET_OSVER < 1050)
</span> /* ffsll */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_FFSLL__ (__MPLS_TARGET_OSVER < 1090)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_FFSLL__ (__MPLS_SDK_MAJOR < 1090)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_FFSLL__ (__MPLS_TARGET_OSVER < 1090)
</span>
/* fls */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_FLS__ (__MPLS_TARGET_OSVER < 1050)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_FLS__ (__MPLS_SDK_MAJOR < 1050)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_FLS__ (__MPLS_TARGET_OSVER < 1050)
</span> /* flsl */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_FLSL__ (__MPLS_TARGET_OSVER < 1050)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_FLSL__ (__MPLS_SDK_MAJOR < 1050)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_FLSL__ (__MPLS_TARGET_OSVER < 1050)
</span> /* flsll */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_FLSLL__ (__MPLS_TARGET_OSVER < 1090)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_FLSLL__ (__MPLS_SDK_MAJOR < 1090)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_FLSLL__ (__MPLS_TARGET_OSVER < 1090)
</span>
/* open_memstream */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_OPEN_MEMSTREAM__ (__MPLS_TARGET_OSVER < 101300)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_OPEN_MEMSTREAM__ (__MPLS_SDK_MAJOR < 101300)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_OPEN_MEMSTREAM__ (__MPLS_TARGET_OSVER < 101300)
</span>
/* fmemopen */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_FMEMOPEN__ (__MPLS_TARGET_OSVER < 101300)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_SUPPORT_FMEMOPEN__ (__MPLS_SDK_MAJOR < 101300)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_SUPPORT_FMEMOPEN__ (__MPLS_TARGET_OSVER < 101300)
</span>
/* pthread_setname_np */
#define __MP_LEGACY_SUPPORT_PTHREAD_SETNAME_NP__ (__MPLS_TARGET_OSVER < 1060)
/* Compound macros, bundling functionality needed by multiple single features. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_NEED_ATCALL_MACROS__ (__MP_LEGACY_SUPPORT_ATCALLS__ || __MP_LEGACY_SUPPORT_SETATTRLISTAT__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_NEED_ATCALL_MACROS__ (__MPLS_SDK_SUPPORT_ATCALLS__ || __MPLS_SDK_SUPPORT_SETATTRLISTAT__)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __MP_LEGACY_SUPPORT_NEED_BEST_FCHDIR__ (__MP_LEGACY_SUPPORT_FDOPENDIR__ || __MP_LEGACY_SUPPORT_ATCALLS__ || __MP_LEGACY_SUPPORT_SETATTRLISTAT__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_SDK_NEED_BEST_FCHDIR__ (__MPLS_SDK_SUPPORT_FDOPENDIR__ || __MPLS_SDK_SUPPORT_ATCALLS__ || __MPLS_SDK_SUPPORT_SETATTRLISTAT__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define __MPLS_LIB_NEED_BEST_FCHDIR__ (__MPLS_LIB_SUPPORT_FDOPENDIR__ || __MPLS_LIB_SUPPORT_ATCALLS__ || __MPLS_LIB_SUPPORT_SETATTRLISTAT__)
</span>
/* UUIDs - for now, just add missing typedef statements */
#define __MPLS_SDK_SUPPORT_UUID__ (__MPLS_SDK_MAJOR < 1060)
<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 884911f..67c1c20 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;'>@@ -1,4 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /*
* Copyright (c) 2019
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,11 +20,14 @@
</span> /* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Do our SDK-related setup */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <_macports_extras/sdkversion.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> /* Include the primary system dirent.h */
#include_next <dirent.h>
/* fdopendir */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_FDOPENDIR__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_FDOPENDIR__
</span>
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +39,6 @@ extern DIR *fdopendir(int fd) __DARWIN_ALIAS_I(fdopendir);
</span>
__MP__END_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_FDOPENDIR__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_SUPPORT_FDOPENDIR__ */
</span>
#endif /* _MACPORTS_DIRENT_H_ */
<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 8bff89f..6cb63ae 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;'>@@ -21,20 +21,23 @@
</span> /* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Do our SDK-related setup */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <_macports_extras/sdkversion.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> /* Include the primary system stdio.h */
#include_next <stdio.h>
/* dprintf */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_DPRINTF__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_DPRINTF__
</span>
__MP__BEGIN_DECLS
extern int dprintf(int fd, const char * __restrict format, ...);
__MP__END_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_DPRINTF__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_SUPPORT_DPRINTF__ */
</span>
/* getline */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_GETLINE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_GETLINE__
</span>
/*
* [XSI] The ssize_t and size_t types shall be defined as described
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,24 +58,24 @@ extern ssize_t getdelim(char **lineptr, size_t *n, int delimiter, FILE *fp);
</span> extern ssize_t getline (char **lineptr, size_t *n, FILE *stream);
__MP__END_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_GETLINE__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_SUPPORT_GETLINE__ */
</span>
/* open_memstream */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_OPEN_MEMSTREAM__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_OPEN_MEMSTREAM__
</span>
__MP__BEGIN_DECLS
FILE *open_memstream(char **ptr, size_t *sizeloc);
__MP__END_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_OPEN_MEMSTREAM__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_SUPPORT_OPEN_MEMSTREAM__ */
</span>
/* fmemopen */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_FMEMOPEN__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_FMEMOPEN__
</span>
__MP__BEGIN_DECLS
FILE *fmemopen(void *buf, size_t size, const char *mode);
__MP__END_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_FMEMOPEN__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_SUPPORT_FMEMOPEN__ */
</span>
#endif /* _MACPORTS_STDIO_H_ */
<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 1ce7dbc..7cba2a6 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;'>@@ -34,26 +34,26 @@ __MP__END_DECLS
</span> #endif /* __MPLS_SDK_SUPPORT_STPNCPY__ */
/* strnlen */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_STRNLEN__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_STRNLEN__
</span> __MP__BEGIN_DECLS
extern size_t strnlen(const char *s, size_t maxlen);
__MP__END_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_SUPPORT_STRNLEN__ */
</span>
/* strndup */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_STRNDUP__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_STRNDUP__
</span> __MP__BEGIN_DECLS
extern char *strndup(const char *s, size_t n);
__MP__END_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_SUPPORT_STRNDUP__ */
</span>
/* memmem */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_MEMMEM__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_MEMMEM__
</span> __MP__BEGIN_DECLS
extern void *
memmem(const void *l, size_t l_len, const void *s, size_t s_len);
__MP__END_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_SUPPORT_MEMMEM__ */
</span>
/*
* Security wrapper support
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/strings.h b/include/strings.h
</span><span style='display:block; white-space:pre;color:#808080;'>index c5e5270..8ce8791 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/strings.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/strings.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,39 +20,42 @@
</span> /* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Do our SDK-related setup */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <_macports_extras/sdkversion.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> /* Include the primary system strings.h */
#include_next <strings.h>
/* ffsl */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_FFSL__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_FFSL__
</span> __MP__BEGIN_DECLS
extern int ffsl(long int);
__MP__END_DECLS
#endif
/* ffsll */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_FFSLL__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_FFSLL__
</span> __MP__BEGIN_DECLS
extern int ffsll(long long int);
__MP__END_DECLS
#endif
/* fls */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_FLS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_FLS__
</span> __MP__BEGIN_DECLS
extern int fls(int);
__MP__END_DECLS
#endif
/* flsl */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_FLSL__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_FLSL__
</span> __MP__BEGIN_DECLS
extern int flsl(long int);
__MP__END_DECLS
#endif
/* flsll */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_FLSLL__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_FLSLL__
</span> __MP__BEGIN_DECLS
extern int flsll(long long int);
__MP__END_DECLS
<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 29eab02..a3cedd5 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;'>@@ -20,6 +20,9 @@
</span> /* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Do our SDK-related setup */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <_macports_extras/sdkversion.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> /* Include the primary system sys/fcntl.h */
#include_next <sys/fcntl.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +37,7 @@
</span> #endif
/* atcalls */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_ATCALLS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_ATCALLS__
</span>
#ifndef AT_FDCWD
#define AT_FDCWD -2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,6 +61,6 @@ extern int openat(int dirfd, const char *pathname, int flags, ...);
</span>
__MP__END_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_ATCALLS__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_SUPPORT_ATCALLS__ */
</span>
#endif /* _MACPORTS_SYSFCNTL_H_ */
<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 4a0f82f..c28bdd2 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;'>@@ -20,10 +20,13 @@
</span> /* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Do our SDK-related setup */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <_macports_extras/sdkversion.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> /* Include the primary system sys/stat.h */
#include_next <sys/stat.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_UTIMENSAT__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_UTIMENSAT__
</span>
#if !defined(UTIME_NOW)
#define UTIME_NOW -1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,31 +39,37 @@
</span> __MP__BEGIN_DECLS
extern int futimens(int fd, const struct timespec _times_in[2]);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-extern int utimensat(int fd, const char *path, const struct timespec _times_in[2], int flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extern int utimensat(int fd, const char *path,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const struct timespec _times_in[2], int flags);
</span>
__MP__END_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_UTIMENSAT__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_SUPPORT_UTIMENSAT__ */
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_ATCALLS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_ATCALLS__
</span>
__MP__BEGIN_DECLS
extern int fchmodat(int dirfd, const char *pathname, mode_t mode, int flags);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-extern int fstatat(int dirfd, const char *pathname, struct stat *buf, int flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extern int fstatat(int dirfd, const char *pathname,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct stat *buf, int flags);
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* 64bit inode types appeared only on 10.5, and currently can't be replaced on Tiger */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/* due to lack of kernel support for the underlying syscalls */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * 64bit inode types appeared only on 10.5, and currently can't be replaced
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * on Tiger due to lack of kernel support for the underlying syscalls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span> #if !__DARWIN_ONLY_64_BIT_INO_T && __MPLS_TARGET_OSVER >= 1050
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int fstatat64(int dirfd, const char *pathname, struct stat64 *buf, int flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+struct stat64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extern int fstatat64(int dirfd, const char *pathname,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct stat64 *buf, int flags);
</span> #endif
extern int mkdirat(int dirfd, const char *pathname, mode_t mode);
__MP__END_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_ATCALLS__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_SUPPORT_ATCALLS__ */
</span>
#if __MP_LEGACY_SUPPORT_LSMOD__
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/sys/stdio.h b/include/sys/stdio.h
</span><span style='display:block; white-space:pre;color:#808080;'>index fdfc512..56bdb5e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/sys/stdio.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/sys/stdio.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@
</span> #include_next <sys/stdio.h>
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_ATCALLS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_ATCALLS__
</span>
/* renameat */
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +37,6 @@ extern int renameat(int olddirfd, const char *oldpath,
</span> int newdirfd, const char *newpath);
__MP__END_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_ATCALLS__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_SUPPORT_ATCALLS__ */
</span>
#endif /* _MACPORTS_SYS_STDIO_H_ */
<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 267239c..fddbc09 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;'>@@ -14,19 +14,22 @@
</span> * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef _MACPORTS_SYSUNISTD_H_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define _MACPORTS_SYSUNISTD_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef _MACPORTS_SYS_UNISTD_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define _MACPORTS_SYS_UNISTD_H_
</span>
/* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Do our SDK-related setup */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <_macports_extras/sdkversion.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> /* Include the primary system sys/unistd.h */
#include_next <sys/unistd.h>
/* For types such as uint32_t. */
#include <stdint.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_ATCALLS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_ATCALLS__
</span>
/*
* [XSI] The ssize_t and size_t types shall be defined as described
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,10 +68,9 @@ extern int unlinkat(int dirfd, const char *pathname, int flags);
</span>
__MP__END_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_ATCALLS__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_SUPPORT_ATCALLS__ */
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_SETATTRLISTAT__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_SETATTRLISTAT__
</span>
/*
* [XSI] The ssize_t and size_t types shall be defined as described
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,6 +89,6 @@ extern int setattrlistat(int dirfd, const char *pathname, void *a,
</span>
__MP__END_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_SETATTRLISTAT__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_SUPPORT_SETATTRLISTAT__ */
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* _MACPORTS_SYSUNISTD_H_ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* _MACPORTS_SYS_UNISTD_H_ */
</span><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 9ede9d1..62399c4 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;'>@@ -43,7 +43,7 @@ __MP__END_DECLS
</span> #endif /* __MPLS_SDK_SUPPORT_TIME_THREAD_SAFE_FUNCTIONS__ */
/* Legacy implementation of clock_gettime */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_GETTIME__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_GETTIME__
</span>
/* One define types and methods if not already defined. */
#if !defined(CLOCK_REALTIME) && !defined(CLOCK_MONOTONIC)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,10 +87,10 @@ extern int clock_getres ( clockid_t clk_id, struct timespec *ts );
</span>
__MP__END_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_GETTIME__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_SUPPORT_GETTIME__ */
</span>
/* Legacy implementation of timespec */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_TIMESPEC_GET__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_TIMESPEC_GET__
</span>
#ifndef TIME_UTC
#define TIME_UTC 1 /* time elapsed since epoch */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,6 +102,6 @@ extern int timespec_get(struct timespec *ts, int base);
</span>
__MP__END_DECLS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_TIMESPEC_GET__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_SUPPORT_TIMESPEC_GET__ */
</span>
#endif /* _MACPORTS_TIME_H_ */
<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 8e01095..f44aa73 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;'>@@ -80,6 +80,9 @@
</span> /* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Do our SDK-related setup */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <_macports_extras/sdkversion.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> /* Include the primary system unistd.h */
#include_next <unistd.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,7 +104,7 @@
</span> #define __MP_LEGACY_SUPPORT_SYSCONF_WRAP_NEED_SC_PHYS_PAGES__ 1
#endif /* !defined(_SC_PHYS_PAGES) || defined (__i386__) */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_FSETATTRLIST__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_FSETATTRLIST__
</span>
#ifdef __LP64__
int fsetattrlist(int,void*,void*,size_t,unsigned int);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,6 +112,6 @@ int fsetattrlist(int,void*,void*,size_t,unsigned int);
</span> int fsetattrlist(int,void*,void*,size_t,unsigned long);
#endif /* defined (__LP64__) */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_FSETATTRLIST__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_SUPPORT_FSETATTRLIST__ */
</span>
#endif /* _MACPORTS_UNISTD_H_ */
<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 27c0146..d37cf2a 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;'>@@ -1,4 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /*
* Copyright (c) 2018 Chris Jones <jonesc@macports.org>
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,29 +20,32 @@
</span> /* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Do our SDK-related setup */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <_macports_extras/sdkversion.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> /* Include the primary system wchar.h */
#include_next <wchar.h>
__MP__BEGIN_DECLS
/* wcsdup */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_WCSDUP__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_WCSDUP__
</span> extern wchar_t * wcsdup(const wchar_t *s);
#endif
/* wcsnlen */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_WCSNLEN__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_WCSNLEN__
</span> extern size_t wcsnlen(const wchar_t *, size_t);
#endif
/* wcpcpy, wcpncpy */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_WCPCPY__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_WCPCPY__
</span> extern wchar_t * wcpcpy(wchar_t *__restrict d, const wchar_t *__restrict s);
extern wchar_t *wcpncpy(wchar_t *__restrict d, const wchar_t *__restrict s, size_t n);
#endif
/* wcsncasecmp, wcscasecmp */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_WCSCASECMP__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_WCSCASECMP__
</span> extern int wcscasecmp(const wchar_t *l, const wchar_t *r);
extern int wcsncasecmp(const wchar_t *l, const wchar_t *r, size_t n);
#endif
<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..1a5d9a9 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;'>@@ -1,4 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /*
* Copyright (c) 2018 Christian Cornelssen
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,14 +17,17 @@
</span> #ifndef _MACPORTS_XLOCALE__WCHAR_H_
#define _MACPORTS_XLOCALE__WCHAR_H_
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* Include the primary system xlocale/_wchar.h */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include_next <xlocale/_wchar.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Do our SDK-related setup */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <_macports_extras/sdkversion.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Include the primary system xlocale/_wchar.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include_next <xlocale/_wchar.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> /* wcsncasecmp_l, wcscasecmp_l */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_WCSCASECMP__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_SUPPORT_WCSCASECMP__
</span> __MP__BEGIN_DECLS
extern int wcscasecmp_l(const wchar_t *l, const wchar_t *r, locale_t locale);
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;color:#808080;'>diff --git a/src/add_symbols.c b/src/add_symbols.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 58aadd2..b97d799 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/add_symbols.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/add_symbols.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,7 @@ extern const char getentropy_tmp10 __asm("$ld$add$os10.10$_getentropy"); __attri
</span> extern const char getentropy_tmp11 __asm("$ld$add$os10.11$_getentropy"); __attribute__((visibility("default"))) const char getentropy_tmp11 = 0;
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if !(__MP_LEGACY_SUPPORT_GETTIME__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if !(__MPLS_LIB_SUPPORT_GETTIME__)
</span> extern const char clock_gettime_tmp4 __asm("$ld$add$os10.4$_clock_gettime"); __attribute__((visibility("default"))) const char clock_gettime_tmp4 = 0;
extern const char clock_gettime_tmp5 __asm("$ld$add$os10.5$_clock_gettime"); __attribute__((visibility("default"))) const char clock_gettime_tmp5 = 0;
extern const char clock_gettime_tmp6 __asm("$ld$add$os10.6$_clock_gettime"); __attribute__((visibility("default"))) const char clock_gettime_tmp6 = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +74,7 @@ extern const char dirfd_tmp6 __asm("$ld$add$os10.6$_dirfd"); __attribute__((visi
</span> extern const char dirfd_tmp7 __asm("$ld$add$os10.7$_dirfd"); __attribute__((visibility("default"))) const char dirfd_tmp7 = 0;
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if !(__MP_LEGACY_SUPPORT_ATCALLS__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if !(__MPLS_LIB_SUPPORT_ATCALLS__)
</span> extern const char fstatat$INODE64_tmp5 __asm("$ld$add$os10.5$_fstatat$INODE64"); __attribute__((visibility("default"))) const char fstatat$INODE64_tmp5 = 0;
extern const char fstatat$INODE64_tmp6 __asm("$ld$add$os10.6$_fstatat$INODE64"); __attribute__((visibility("default"))) const char fstatat$INODE64_tmp6 = 0;
extern const char fstatat$INODE64_tmp7 __asm("$ld$add$os10.7$_fstatat$INODE64"); __attribute__((visibility("default"))) const char fstatat$INODE64_tmp7 = 0;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/atcalls.c b/src/atcalls.c
</span><span style='display:block; white-space:pre;color:#808080;'>index c309dd6..554be51 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/atcalls.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/atcalls.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 __MP_LEGACY_SUPPORT_ATCALLS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_ATCALLS__
</span>
#include "common-priv.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -300,6 +300,6 @@ int unlinkat(int dirfd, const char *pathname, int flags)
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_ATCALLS__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_ATCALLS__ */
</span>
/* vi:set et ts=4 sw=4: */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/best_fchdir.c b/src/best_fchdir.c
</span><span style='display:block; white-space:pre;color:#808080;'>index e1e5dd4..ab8a665 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/best_fchdir.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/best_fchdir.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/*-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/*
</span> * Copyright (c) 2019
* Copyright (c) 2023 raf <raf@raf.org>
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,8 @@
</span>
/* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_NEED_BEST_FCHDIR__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_NEED_BEST_FCHDIR__
</span>
#include "common-priv.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,4 +40,4 @@ int best_fchdir(int dirfd)
</span> #endif
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_NEED_BEST_FCHDIR__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_NEED_BEST_FCHDIR__ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/common-priv.h b/src/common-priv.h
</span><span style='display:block; white-space:pre;color:#808080;'>index c65fe84..afafec2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/common-priv.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/common-priv.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,23 +31,23 @@
</span> * Version 2.0.
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef macports_common_priv_h_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define macports_common_priv_h_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifndef _MACPORTS_COMMON_PRIV_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define _MACPORTS_COMMON_PRIV_H_
</span>
/* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /* Should be generic enough so that we don't need a global feature macro. */
<span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Do our SDK-related setup */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <_macports_extras/sdkversion.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #include <sys/errno.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_NEED_ATCALL_MACROS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_NEED_ATCALL_MACROS__
</span> #include <sys/fcntl.h>
#include <fcntl.h>
#include <unistd.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_NEED_ATCALL_MACROS__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_NEED_ATCALL_MACROS__ */
</span>
#define PROTECT_ERRNO(what) ({ int __err = (errno); what; errno = __err; })
#define ERR_ON(code, what) if (what) { errno = (code); return -1; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,14 +57,14 @@
</span> #endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_NEED_BEST_FCHDIR__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_NEED_BEST_FCHDIR__
</span>
int best_fchdir(int dirfd);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_NEED_BEST_FCHDIR__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_NEED_BEST_FCHDIR__ */
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_NEED_ATCALL_MACROS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_SDK_NEED_ATCALL_MACROS__
</span>
#define _ATCALL(fd, p, onerr, what) \
({ typeof(what) __result; \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,6 +90,6 @@ int best_fchdir(int dirfd);
</span>
#define ATCALL(fd, p, what) _ATCALL(fd, p, -1, what)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_NEED_ATCALL_MACROS__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_SDK_NEED_ATCALL_MACROS__ */
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* !defined (macports_common_priv_h_) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* _MACPORTS_COMMON_PRIV_H_ */
</span><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 c843467..114a07e 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 __MP_LEGACY_SUPPORT_FDOPENDIR__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_FDOPENDIR__
</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 /* __MP_LEGACY_SUPPORT_FDOPENDIR__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_FDOPENDIR__ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/dprintf.c b/src/dprintf.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 83f7e9d..51b844b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/dprintf.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/dprintf.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@
</span>
// MP support header
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_DPRINTF__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_DPRINTF__
</span>
#include <stdarg.h>
#include <stdio.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,4 +36,4 @@ int dprintf(int fildes, const char * __restrict format, ...) {
</span> return result;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_DPRINTF__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_DPRINTF__ */
</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 d8f7e5e..3af64b0 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;'>@@ -1,4 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /*
* Copyright (c) 2019
* Copyright (C) 2023 raf <raf@raf.org>, Tavian Barnes <tavianator@tavianator.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +21,7 @@
</span> /* Do our SDK-related setup */
#include <_macports_extras/sdkversion.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_FDOPENDIR__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_FDOPENDIR__
</span>
#include "common-priv.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,4 +83,4 @@ DIR *fdopendir(int dirfd) {
</span> return dir;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_FDOPENDIR__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_FDOPENDIR__ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/fmemopen.c b/src/fmemopen.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 569340f..b798277 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/fmemopen.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/fmemopen.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@
</span>
/* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_FMEMOPEN__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_FMEMOPEN__
</span>
#include <sys/cdefs.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -265,4 +265,4 @@ fmemopen_close(void *cookie)
</span> return (0);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_FMEMOPEN__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_FMEMOPEN__ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/fsetattrlist.c b/src/fsetattrlist.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 0c30847..9ebd2e4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/fsetattrlist.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/fsetattrlist.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,8 @@
</span>
/* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_FSETATTRLIST__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_FSETATTRLIST__
</span>
#include <sys/attr.h>
#include <sys/fcntl.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,4 +75,4 @@ int fsetattrlist(int fd, void *a, void *buf, size_t size, unsigned long flags)
</span> return ret;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_FSETATTRLIST__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_FSETATTRLIST__ */
</span><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 1b91b8c..2ce41b3 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;'>@@ -1,5 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/*-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/*
</span> * Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +29,7 @@
</span>
// MP support header
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_GETLINE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_GETLINE__
</span>
#ifdef HAVE_CONFIG_H
#include <config.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,4 +101,4 @@ getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp)
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_GETLINE__ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/getline.c b/src/getline.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 63a4cc2..9d77113 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/getline.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/getline.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/*-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/*
</span> * Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +29,7 @@
</span>
// MP support header
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_GETLINE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_GETLINE__
</span>
#ifdef HAVE_CONFIG_H
#include <config.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,4 +44,4 @@ getline(char **buf, size_t *bufsiz, FILE *fp)
</span> return getdelim(buf, bufsiz, '\n', fp);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_GETLINE__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_GETLINE__ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports_legacy_symbol_aliases.c b/src/macports_legacy_symbol_aliases.c
</span><span style='display:block; white-space:pre;color:#808080;'>index f117347..c4a5dbb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports_legacy_symbol_aliases.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports_legacy_symbol_aliases.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,11 +56,11 @@ int dirfd(DIR *dirp)
</span> }
#endif /* __MP_LEGACY_SUPPORT_SYMBOL__dirfd__ */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_ATCALLS__ && __MPLS_TARGET_OSVER >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_ATCALLS__ && __MPLS_TARGET_OSVER >= 1050
</span> #include <sys/stat.h>
/*
The need for this function is highly limited.
The Rust compiler requires `fstatat$INODE64` to be a library symbol.
*/
int fstatat$INODE64(int dirfd, const char *pathname, struct stat64 *buf, int flags) { return fstatat64(dirfd, pathname, buf, flags); }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_ATCALLS__ && __MPLS_TARGET_OSVER >= 1050 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_ATCALLS__ && __MPLS_TARGET_OSVER >= 1050 */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/memmem.c b/src/memmem.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 592003c..b2b1943 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/memmem.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/memmem.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/*-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/*
</span> * Copyright (c) 2005 Pascal Gloor <pascal.gloor@spale.com>
*
* Redistribution and use in source and binary forms, with or without
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +28,7 @@
</span>
/* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_MEMMEM__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_MEMMEM__
</span>
#include <sys/cdefs.h>
#include <string.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,4 +68,4 @@ memmem(const void *l, size_t l_len, const void *s, size_t s_len)
</span> return NULL;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_MEMMEM__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_MEMMEM__ */
</span><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 f52b55d..3bb1f5b 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;'>@@ -47,7 +47,7 @@
</span>
/* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_OPEN_MEMSTREAM__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_OPEN_MEMSTREAM__
</span>
#include "stdio.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,4 +177,4 @@ FILE *open_memstream(char **ptr, size_t *sizeloc)
</span> return 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_OPEN_MEMSTREAM__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_OPEN_MEMSTREAM__ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/setattrlistat.c b/src/setattrlistat.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 986f48d..7b514f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/setattrlistat.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/setattrlistat.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,10 +30,10 @@
</span> * Version 2.0.
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_SETATTRLISTAT__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_SETATTRLISTAT__
</span>
#include "common-priv.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,4 +73,4 @@ int setattrlistat(int dirfd, const char *pathname, void *a,
</span> return ret;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_SETATTRLISTAT__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_SETATTRLISTAT__ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/strings.c b/src/strings.c
</span><span style='display:block; white-space:pre;color:#808080;'>index ff408a9..c9a281f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/strings.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/strings.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/*-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/*
</span> * SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 1990, 1993
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +32,7 @@
</span> // MP support header
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_FFSL__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_FFSL__
</span> int ffsl(long mask)
{
int bit = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +45,7 @@ int ffsl(long mask)
</span> }
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_FFSLL__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_FFSLL__
</span> int ffsll(long long mask)
{
int bit = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +58,7 @@ int ffsll(long long mask)
</span> }
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_FLS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_FLS__
</span> int fls(int mask)
{
int bit = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +71,7 @@ int fls(int mask)
</span> }
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_FLSL__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_FLSL__
</span> int flsl(long mask)
{
int bit = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +84,7 @@ int flsl(long mask)
</span> }
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_FLSLL__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_FLSLL__
</span> int flsll(long long mask)
{
int bit = 0;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/strndup.c b/src/strndup.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 08ac065..7ad443e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/strndup.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/strndup.c
</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) 1995 - 1999 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +37,7 @@
</span>
// MP support header
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_STRNDUP__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_STRNDUP__
</span>
#ifndef HAVE_STRNDUP
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,4 +62,4 @@ strndup (const char *old, size_t sz)
</span>
#endif /* HAVE_STRNDUP */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_STRDUP__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_STRNDUP__ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/strnlen.c b/src/strnlen.c
</span><span style='display:block; white-space:pre;color:#808080;'>index f64352e..d852454 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/strnlen.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/strnlen.c
</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) 1995 - 1999 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +33,7 @@
</span>
// MP support header
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_STRNLEN__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_STRNLEN__
</span>
#ifdef HAVE_CONFIG_H
# include <config.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,4 +54,4 @@ strnlen (const char *s, size_t len)
</span> return i;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_STRNLEN__ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/time.c b/src/time.c
</span><span style='display:block; white-space:pre;color:#808080;'>index ec3885c..e65ab49 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/time.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/time.c
</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) 2018 Chris Jones <jonesc@macports.org>
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +16,7 @@
</span>
#include "time.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_GETTIME__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_GETTIME__
</span>
#include <sys/time.h>
#include <sys/sysctl.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,9 +125,9 @@ int clock_getres( clockid_t clk_id, struct timespec *ts )
</span> return ret;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_GETTIME__ */
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_TIMESPEC_GET__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_TIMESPEC_GET__
</span>
int timespec_get(struct timespec *ts, int base)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,4 +143,4 @@ int timespec_get(struct timespec *ts, int base)
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_TIMESPEC_GET__ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/utimensat.c b/src/utimensat.c
</span><span style='display:block; white-space:pre;color:#808080;'>index ba325f1..a8a43a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/utimensat.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/utimensat.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@
</span>
// MP support header
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_UTIMENSAT__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_UTIMENSAT__
</span>
#include <sys/types.h>
#include <sys/stat.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,4 +147,4 @@ utimensat(int fd, const char *path, const struct timespec _times_in[2], int flag
</span> return setattrlistat(fd, path, &a, ×_out, attrbuf_size, flags_out);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_UTIMENSAT__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_UTIMENSAT__ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/wcpcpy_family.c b/src/wcpcpy_family.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f4ca00..1a2ab98 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/wcpcpy_family.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/wcpcpy_family.c
</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) 2018 Christian Cornelssen
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +16,8 @@
</span>
// MP support header
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_WCPCPY__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_WCPCPY__
</span>
#include <wchar.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,4 +34,4 @@ wchar_t *wcpcpy(wchar_t *__restrict d, const wchar_t *__restrict s)
</span> return d;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_WCPCPY__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_WCPCPY__ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/wcscasecmp_family.c b/src/wcscasecmp_family.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 52fe63d..0a7e505 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/wcscasecmp_family.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/wcscasecmp_family.c
</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) 2018 Christian Cornelssen
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +16,8 @@
</span>
// MP support header
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_WCSCASECMP__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_WCSCASECMP__
</span>
#include <wchar.h>
#include <wctype.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,4 +62,4 @@ int wcscasecmp(const wchar_t *l, const wchar_t *r)
</span> return wcsncasecmp_l(l, r, -1, 0);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_WCSCASECMP__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_WCSCASECMP__ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/wcsdup.c b/src/wcsdup.c
</span><span style='display:block; white-space:pre;color:#808080;'>index eaf1443..6e8ff6d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/wcsdup.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/wcsdup.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/*-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/*
</span> * Copyright (c) 2005 Tim J. Robbins.
* All rights reserved.
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +26,7 @@
</span>
// MP support header
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_WCSDUP__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_WCSDUP__
</span>
#include <sys/cdefs.h>
#include <stdlib.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,5 +44,4 @@ wcsdup(const wchar_t *s)
</span> return (wmemcpy(copy, s, len));
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_WCSDUP__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_WCSDUP__ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/wcsnlen.c b/src/wcsnlen.c
</span><span style='display:block; white-space:pre;color:#808080;'>index c42af19..18a4b8c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/wcsnlen.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/wcsnlen.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@
</span>
// MP support header
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_WCSNLEN__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_WCSNLEN__
</span>
#include <wchar.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,4 +41,4 @@ size_t wcsnlen(const wchar_t *s, size_t n)
</span> return n;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __MP_LEGACY_SUPPORT_WCSNLEN__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* __MPLS_LIB_SUPPORT_WCSNLEN__ */
</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 9c43e86..e9dee88 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 __MP_LEGACY_SUPPORT_FDOPENDIR__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MPLS_LIB_SUPPORT_FDOPENDIR__
</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 /* !__MP_LEGACY_SUPPORT_FDOPENDIR__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#else /* !__MPLS_LIB_SUPPORT_FDOPENDIR__ */
</span>
int main(){ return 0; }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* !__MP_LEGACY_SUPPORT_FDOPENDIR__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* !__MPLS_LIB_SUPPORT_FDOPENDIR__ */
</span></pre><pre style='margin:0'>
</pre>