Skip to content

Commit

Permalink
Merge commit 88433e6 from upstream OpenZFS (by Jessica Clarke)
Browse files Browse the repository at this point in the history
  sys/types32.h: Remove struct timeval32 from libspl's header (openzfs#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 <[email protected]>
  Reviewed-by: Rob Norris <[email protected]>
  Reviewed-by: Alexander Motin <[email protected]>
  Reviewed-by: Tony Hutter <[email protected]>

MFC after:	1 week
  • Loading branch information
jrtc27 authored and bsdjhb committed Nov 15, 2024
1 parent cd52536 commit abd51e4
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions lib/libspl/include/sys/types32.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit abd51e4

Please sign in to comment.