From 9d2e0d31f76dfa2922236675981746090bbf3c1a Mon Sep 17 00:00:00 2001
From: Dan Cross <cross@gajendra.net>
Date: Fri, 25 Jul 2025 19:02:59 +0000
Subject: DragonFly: fix build

Fix the build for DragonFlyBSD.
---
 include/u.h                 | 3 +++
 src/cmd/vbackup/mount-BSD.c | 6 ++++++
 src/libmach/DragonFly.c     | 8 ++++----
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/include/u.h b/include/u.h
index aaa2e416..88c5fa8a 100644
--- a/include/u.h
+++ b/include/u.h
@@ -38,6 +38,9 @@ extern "C" {
 #	define _ALL_SOURCE
 #	undef HAS_SYS_TERMIOS
 #endif
+#if defined(__DragonFly__)
+#	undef HAS_SYS_TERMIOS
+#endif
 #define _LARGEFILE64_SOURCE 1
 #define _FILE_OFFSET_BITS 64
 #define __USE_POSIX 1 //needed for sigjmp_buf in glibc setjmp.h
diff --git a/src/cmd/vbackup/mount-BSD.c b/src/cmd/vbackup/mount-BSD.c
index 63841b5c..572fba47 100644
--- a/src/cmd/vbackup/mount-BSD.c
+++ b/src/cmd/vbackup/mount-BSD.c
@@ -12,6 +12,10 @@
 #if defined(__FreeBSD_version) && __FreeBSD_version >= 800000
 #include <fs/nfs/rpcv2.h>
 #include <fs/nfs/nfsproto.h>
+# elif defined(__DragonFly__)
+#include <vfs/nfs/rpcv2.h>
+#include <vfs/nfs/nfsproto.h>
+# elif defined(__DragonFly__)
 # else
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
@@ -21,6 +25,8 @@
 #	ifndef MNT_NODEV
 #		define MNT_NODEV 0
 #	endif
+#elif defined(__DragonFly__)
+#	include <vfs/nfs/nfs.h>
 #else
 #	include <nfs/nfs.h>
 #endif
diff --git a/src/libmach/DragonFly.c b/src/libmach/DragonFly.c
index 33bd8e9c..33cc86ec 100644
--- a/src/libmach/DragonFly.c
+++ b/src/libmach/DragonFly.c
@@ -30,8 +30,8 @@ struct PtraceRegs
 	int pid;
 };
 
-static int ptracerw(Map*, Seg*, ulong, void*, uint, int);
-static int ptraceregrw(Regs*, char*, ulong*, int);
+static int ptracerw(Map*, Seg*, uvlong, void*, uint, int);
+static int ptraceregrw(Regs*, char*, uvlong*, int);
 
 void
 unmapproc(Map *map)
@@ -92,7 +92,7 @@ detachproc(int pid)
 }
 
 static int
-ptracerw(Map *map, Seg *seg, ulong addr, void *v, uint n, int isr)
+ptracerw(Map *map, Seg *seg, uvlong addr, void *v, uint n, int isr)
 {
 	int i;
 	u32int u;
@@ -167,7 +167,7 @@ reg2freebsd(char *reg)
 }
 
 static int
-ptraceregrw(Regs *regs, char *name, ulong *val, int isr)
+ptraceregrw(Regs *regs, char *name, uvlong *val, int isr)
 {
 	int pid;
 	ulong addr;
-- 
cgit v1.2.3