git: 796c6031cde6 - main - Merge commit 88433e640ddb from upstream OpenZFS (by Jessica Clarke)

The branch main has been updated by jrtc27:

URL: https://cgit.FreeBSD.org/src/commit/?id=796c6031cde6dfdd92b4d178792fc0534bf788c5

commit 796c6031cde6dfdd92b4d178792fc0534bf788c5
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2024-09-11 17:01:06 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2024-09-11 17:01:06 +0000

    Merge commit 88433e640ddb from upstream OpenZFS (by Jessica Clarke)
    
      sys/types32.h: Remove struct timeval32 from libspl's header (#16491)
    
      macOS Sequoia's sys/sockio.h, as included by various bootstrap tools
      whilst building FreeBSD, has started to include net/if.h, which then
      includes sys/_types/_timeval32.h and provide a conflicting definition
      for struct timeval32. Since this type is entirely unused within OpenZFS,
      simply delete the type rather than adding in some kind of OS detection.
    
      This fixes building FreeBSD on macOS Sequoia (Beta).
    
      Signed-off-by: Jessica Clarke <jrtc27@jrtc27.com>
      Reviewed-by: Rob Norris <rob.norris@klarasystems.com>
      Reviewed-by: Alexander Motin <mav@FreeBSD.org>
      Reviewed-by: Tony Hutter <hutter2@llnl.gov>
    
    MFC after:      1 week
---
 sys/contrib/openzfs/lib/libspl/include/sys/types32.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/types32.h b/sys/contrib/openzfs/lib/libspl/include/sys/types32.h
index eadc67c7122a..d065ebed03b7 100644
--- a/sys/contrib/openzfs/lib/libspl/include/sys/types32.h
+++ b/sys/contrib/openzfs/lib/libspl/include/sys/types32.h
@@ -65,11 +65,6 @@ typedef	int32_t		ssize32_t;
 typedef	int32_t		time32_t;
 typedef	int32_t		clock32_t;
 
-struct timeval32 {
-	time32_t	tv_sec;		/* seconds */
-	int32_t		tv_usec;	/* and microseconds */
-};
-
 typedef struct timespec32 {
 	time32_t	tv_sec;		/* seconds */
 	int32_t		tv_nsec;	/* and nanoseconds */