<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/11bf0f4b0a3bab911132a9fed75ba3ec11d7c46a">https://github.com/macports/macports-legacy-support/commit/11bf0f4b0a3bab911132a9fed75ba3ec11d7c46a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 11bf0f4b0a3bab911132a9fed75ba3ec11d7c46a
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Wed May 29 17:50:01 2024 -0700
<span style='display:block; white-space:pre;color:#404040;'> Fix incorrect and missing include_next comments.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also adds some that were missing.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also removes some leading blank lines.
</span>---
include/IOKit/usb/USB.h | 1 +
include/OpenGL/gliDispatch.h | 1 +
include/mach/machine.h | 2 +-
include/stdio.h | 3 +--
include/strings.h | 3 +--
include/sys/fcntl.h | 3 +--
include/sys/random.h | 3 +--
include/sys/spawn.h | 3 +--
include/sys/stat.h | 3 +--
include/sys/time.h | 3 +--
include/sys/unistd.h | 3 +--
include/unistd.h | 1 +
12 files changed, 12 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/IOKit/usb/USB.h b/include/IOKit/usb/USB.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 20ce029..48083a3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/IOKit/usb/USB.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/IOKit/usb/USB.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,4 +29,5 @@
</span> #endif
#endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Include the primary system IOKit/usb/USB.h */
</span> #include_next <IOKit/usb/USB.h>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/OpenGL/gliDispatch.h b/include/OpenGL/gliDispatch.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 06ce3cf..8695890 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/OpenGL/gliDispatch.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/OpenGL/gliDispatch.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +32,7 @@
</span> # endif
#endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Include the primary system OpenGL/gliDispatch.h */
</span> #include_next <OpenGL/gliDispatch.h>
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/mach/machine.h b/include/mach/machine.h
</span><span style='display:block; white-space:pre;color:#808080;'>index a938ab3..fcf99b7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/mach/machine.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/mach/machine.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@
</span> * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Include the primary system mach/machine.h */
</span> #include_next <mach/machine.h>
#ifndef CPU_SUBTYPE_ARM64E
<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 3ddd718..89f2dae 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;'>@@ -1,4 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /*
* Copyright (c) 2018 Chris Jones <jonesc@macports.org>
* Copyright (c) 2018
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +21,7 @@
</span> /* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* Include the primary system time.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Include the primary system stdio.h */
</span> #include_next <stdio.h>
/* dprintf */
<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 667ed3d..c5e5270 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;'>@@ -1,4 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /*
* Copyright (c) 2020 Chris Jones <jonesc@macports.org>
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +20,7 @@
</span> /* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* Include the primary system string.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Include the primary system strings.h */
</span> #include_next <strings.h>
/* ffsl */
<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 b473fb8..29eab02 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;'>@@ -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,7 +20,7 @@
</span> /* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* Include the primary system fcntl.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Include the primary system sys/fcntl.h */
</span> #include_next <sys/fcntl.h>
/* replace missing O_CLOEXEC definition with 0, which works
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/sys/random.h b/include/sys/random.h
</span><span style='display:block; white-space:pre;color:#808080;'>index d1fcd64..96a0a5f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/sys/random.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/sys/random.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) 2021
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +20,7 @@
</span> /* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* Include the primary system random.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Include the primary system sys/random.h */
</span> #include_next <sys/random.h>
#if __MP_LEGACY_SUPPORT_GETENTROPY__
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/sys/spawn.h b/include/sys/spawn.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 75b5ca4..1c2968f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/sys/spawn.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/sys/spawn.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) 2020
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +25,7 @@
</span> */
#if (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* Include the primary system sys/queue.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Include the primary system sys/spawn.h */
</span> #include_next <sys/spawn.h>
/* replace if missing */
<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 55605bd..11fe3e5 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;'>@@ -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,7 +20,7 @@
</span> /* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* Include the primary system stat.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Include the primary system sys/stat.h */
</span> #include_next <sys/stat.h>
#if __MP_LEGACY_SUPPORT_UTIMENSAT__
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/sys/time.h b/include/sys/time.h
</span><span style='display:block; white-space:pre;color:#808080;'>index fb426f3..71174a3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/sys/time.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/sys/time.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) 2020
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +20,7 @@
</span> /* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* Include the primary system time.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Include the primary system sys/time.h */
</span> #include_next <sys/time.h>
#if __MP_LEGACY_SUPPORT_LUTIMES__
<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 a66c332..267239c 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;'>@@ -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,7 +20,7 @@
</span> /* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* Include the primary system unistd.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Include the primary system sys/unistd.h */
</span> #include_next <sys/unistd.h>
/* For types such as uint32_t. */
<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 a8b1672..8e01095 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,7 @@
</span> /* MP support header */
#include "MacportsLegacySupport.h"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Include the primary system unistd.h */
</span> #include_next <unistd.h>
#ifndef _SC_NPROCESSORS_CONF
</pre><pre style='margin:0'>
</pre>