Unbreak on FreeBSD 10 and clang.

This commit is contained in:
Max Khon 2013-11-18 12:18:05 +00:00
parent 0756362fee
commit ebf3173f30
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=334177
2 changed files with 42 additions and 0 deletions

View file

@ -0,0 +1,11 @@
--- drivers/dahdi/dahdi-base.c.orig 2013-11-18 19:11:51.000000000 +0700
+++ drivers/dahdi/dahdi-base.c 2013-11-18 19:12:07.000000000 +0700
@@ -10224,6 +10224,8 @@
.d_poll = dahdi_device_poll,
.d_name = "dahdi",
#if __FreeBSD_version >= 800039
+ .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

View file

@ -0,0 +1,31 @@
--- drivers/dahdi/wctc4xxp/base.c.orig 2013-11-18 19:15:33.000000000 +0700
+++ drivers/dahdi/wctc4xxp/base.c 2013-11-18 19:15:48.000000000 +0700
@@ -2423,8 +2423,8 @@
if (unlikely(count > SFRAME_SIZE - sizeof(struct rtp_packet))) {
DTE_DEBUG(DTE_DEBUG_GENERAL,
- "Cannot transcode packet of %Zu bytes. This exceeds the " \
- "maximum size of %Zu bytes.\n", count,
+ "Cannot transcode packet of %zu bytes. This exceeds the " \
+ "maximum size of %zu bytes.\n", count,
SFRAME_SIZE - sizeof(struct rtp_packet));
return -EINVAL;
}
@@ -2434,7 +2434,7 @@
(G723_SID_BYTES != count)) {
DTE_DEBUG(DTE_DEBUG_GENERAL,
"Trying to transcode packet into G723 format " \
- "that is %Zu bytes instead of the expected " \
+ "that is %zu bytes instead of the expected " \
"%d/%d/%d bytes.\n", count, G723_5K_BYTES,
G723_6K_BYTES, G723_SID_BYTES);
return -EINVAL;
@@ -2465,7 +2465,7 @@
cpvt->seqno += 1;
DTE_DEBUG(DTE_DEBUG_RTP_TX,
- "Sending packet of %Zu byte on channel (%p).\n", count, dtc);
+ "Sending packet of %zu byte on channel (%p).\n", count, dtc);
atomic_inc(&cpvt->stats.packets_sent);
wctc4xxp_transmit_cmd(wc, cmd);