mirror of
https://git.freebsd.org/ports.git
synced 2025-06-12 00:00:33 -04:00
c5fa8f5068
Partially unbreak build by adding missing header and disabling -Werror. The remaining complete fix may be trivial but requires testing. Pass maintainership to submitter due to current maintainer inactivity. PR: 252907 Approved by: maintainer timeout (fjoe, 9 months)
45 lines
1.9 KiB
C
45 lines
1.9 KiB
C
--- freebsd/drivers/dahdi/dahdi-base.c.orig 2021-11-09 20:52:37 UTC
|
|
+++ freebsd/drivers/dahdi/dahdi-base.c
|
|
@@ -48,6 +48,7 @@
|
|
#include <sys/module.h>
|
|
#include <sys/poll.h>
|
|
#include <net/ppp_defs.h>
|
|
+#include <sys/eventhandler.h>
|
|
|
|
#include "version.h"
|
|
|
|
@@ -4344,8 +4345,7 @@ static int dahdi_common_ioctl(struct file *file, unsig
|
|
if (spans[i]->manufacturer)
|
|
dahdi_copy_string(stack.spaninfo.manufacturer, spans[i]->manufacturer,
|
|
sizeof(stack.spaninfo.manufacturer));
|
|
- if (spans[i]->devicetype)
|
|
- dahdi_copy_string(stack.spaninfo.devicetype, spans[i]->devicetype, sizeof(stack.spaninfo.devicetype));
|
|
+ dahdi_copy_string(stack.spaninfo.devicetype, spans[i]->devicetype, sizeof(stack.spaninfo.devicetype));
|
|
dahdi_copy_string(stack.spaninfo.location, spans[i]->location, sizeof(stack.spaninfo.location));
|
|
if (spans[i]->spantype)
|
|
dahdi_copy_string(stack.spaninfo.spantype, spans[i]->spantype, sizeof(stack.spaninfo.spantype));
|
|
@@ -4406,10 +4406,9 @@ static int dahdi_common_ioctl(struct file *file, unsig
|
|
dahdi_copy_string(stack.spaninfo_v1.manufacturer,
|
|
spans[i]->manufacturer,
|
|
sizeof(stack.spaninfo_v1.manufacturer));
|
|
- if (spans[i]->devicetype)
|
|
- dahdi_copy_string(stack.spaninfo_v1.devicetype,
|
|
- spans[i]->devicetype,
|
|
- sizeof(stack.spaninfo_v1.devicetype));
|
|
+ dahdi_copy_string(stack.spaninfo_v1.devicetype,
|
|
+ spans[i]->devicetype,
|
|
+ sizeof(stack.spaninfo_v1.devicetype));
|
|
dahdi_copy_string(stack.spaninfo_v1.location,
|
|
spans[i]->location,
|
|
sizeof(stack.spaninfo_v1.location));
|
|
@@ -9263,7 +9262,9 @@ static struct cdevsw dahdi_devsw = {
|
|
.d_poll = dahdi_device_poll,
|
|
.d_mmap = dahdi_device_mmap,
|
|
.d_name = "dahdi",
|
|
-#if __FreeBSD_version >= 800039
|
|
+#if __FreeBSD_version >= 1000000
|
|
+ .d_flags = D_TRACKCLOSE | D_NEEDMINOR,
|
|
+#elif __FreeBSD_version >= 800039
|
|
.d_flags = D_PSEUDO | D_TRACKCLOSE | D_NEEDMINOR
|
|
#else
|
|
.d_flags = D_PSEUDO | D_TRACKCLOSE
|