summaryrefslogtreecommitdiff
path: root/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2021-01-30 13:12:16 +0000
committerDimitry Andric <dim@FreeBSD.org>2021-01-30 13:12:16 +0000
commit5fd66cdfbf4bae9c1247eda874d443a359be4691 (patch)
tree8e916db9f2c894409fb3c52afe283f92c7067ad5 /sysutils/lsof/files/patch-dialects-freebsd-dlsof.h
parent- Update to 0.58.0 (diff)
sysutils/lsof: Update to 4.94
* Update to 4.94. * Update or remove patches that are included in upstream. * Fix build with Clang 11 without setting 'CFLAGS+=-fcommon' in Makefile. * Use new pwddesc structure if applicable. Change Log: https://github.com/lsof-org/lsof/releases/tag/4.94.0 Submitted by: Yasuhiro Kimura <yasu@utahime.org> PR: 251096 MFH: 2021Q1
Diffstat (limited to 'sysutils/lsof/files/patch-dialects-freebsd-dlsof.h')
-rw-r--r--sysutils/lsof/files/patch-dialects-freebsd-dlsof.h43
1 files changed, 9 insertions, 34 deletions
diff --git a/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h b/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h
index 17bcc69d323c..5c8b9aadbdee 100644
--- a/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h
+++ b/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h
@@ -1,40 +1,15 @@
---- dialects/freebsd/dlsof.h.orig 2019-05-08 07:32:25 UTC
+--- dialects/freebsd/dlsof.h.orig 2020-11-10 19:00:21 UTC
+++ dialects/freebsd/dlsof.h
-@@ -38,6 +38,7 @@
- #if !defined(FREEBSD_LSOF_H)
- #define FREEBSD_LSOF_H 1
-
-+#include <stddef.h>
- #include <stdlib.h>
- #include <dirent.h>
- #include <nlist.h>
-@@ -45,6 +46,12 @@
- #include <signal.h>
- #include <unistd.h>
-
-+#if FREEBSDV>=13000
-+/* This header is a huge mess. Please don't support EOL FreeBSD releases. */
-+#define _KERNEL 1
-+#include <sys/_lock.h>
-+#undef _KERNEL
-+#endif /* FREEBSDV>=13000 */
- # if FREEBSDV>=4000
- # if FREEBSDV>=5000
- # if FREEBSDV<6020
-@@ -105,6 +112,12 @@ typedef struct device *device_t;
+@@ -559,7 +559,7 @@ typedef u_long KA_T;
+ * Global storage definitions (including their structure definitions)
+ */
- #include <sys/conf.h>
+-struct file * Cfp;
++extern struct file * Cfp;
-+/*
-+ * include <stdbool.h> for refcount(9)
-+ */
-+#include <stdbool.h>
-+
-+
- # if defined(HAS_VM_MEMATTR_T)
- #undef vm_memattr_t
- # endif /* defined(HAS_VM_MEMATTR_T) */
-@@ -652,9 +665,15 @@ struct sfile {
+ # if FREEBSDV>=2000
+ extern kvm_t *Kd;
+@@ -663,9 +663,15 @@ struct sfile {
*/
struct namecache {