git: 59aa64914aeb - main - cross: Move Solaris API64 defines to common

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=59aa64914aeb1b2cccc0d4fc39ead2ee159a1e5b

commit 59aa64914aeb1b2cccc0d4fc39ead2ee159a1e5b
Author:     Val Packett <val@packett.cool>
AuthorDate: 2024-05-23 21:49:53 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-05-24 02:03:18 +0000

    cross: Move Solaris API64 defines to common
    
    off64_t is needed for both Linux (musl) and MacOS, so move them to the
    common area. Somehow glibc provides the definition, but defining it
    doesn't hurt and hels in the musl case.
    
    Reviewed by: allanjude, jrtc27
    Pull Request: https://github.com/freebsd/freebsd-src/pull/1066
---
 tools/build/cross-build/include/common/sys/_types.h | 3 +++
 tools/build/cross-build/include/mac/sys/_types.h    | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/build/cross-build/include/common/sys/_types.h b/tools/build/cross-build/include/common/sys/_types.h
index 650edc8080d0..408f0537d1e6 100644
--- a/tools/build/cross-build/include/common/sys/_types.h
+++ b/tools/build/cross-build/include/common/sys/_types.h
@@ -45,3 +45,6 @@
  * Neither GLibc nor macOS define __va_list but many FreeBSD headers require it.
  */
 typedef __builtin_va_list __va_list;
+
+/* Needed for opensolaris compat. */
+typedef	__int64_t	off64_t;
diff --git a/tools/build/cross-build/include/mac/sys/_types.h b/tools/build/cross-build/include/mac/sys/_types.h
index 5ca37580b85a..8d39fc39f087 100644
--- a/tools/build/cross-build/include/mac/sys/_types.h
+++ b/tools/build/cross-build/include/mac/sys/_types.h
@@ -41,5 +41,3 @@
  * __darwin_ct_rune_t exists.
  */
 typedef __darwin_ct_rune_t __ct_rune_t;
-/* Needed for opensolaris compat. */
-typedef	__int64_t	off64_t;