mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-25 07:49:18 +00:00
Code Issues Releases Activity

Merge commit 88433e640d from upstream OpenZFS (by Jessica Clarke)

Browse Source 
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
This commit is contained in:
Jessica Clarke 2024-09-11 18:01:06 +01:00
parent 299175f2e5
commit 796c6031cd
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/contrib/openzfs/lib/libspl/include/sys/types32.h
View File

@ -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 */