Date: Mon, 18 Nov 2013 12:18:05 +0000 (UTC) From: Max Khon <fjoe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334177 - head/misc/dahdi-kmod26/files Message-ID: <201311181218.rAICI5HS076428@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fjoe Date: Mon Nov 18 12:18:05 2013 New Revision: 334177 URL: http://svnweb.freebsd.org/changeset/ports/334177 Log: Unbreak on FreeBSD 10 and clang. Added: head/misc/dahdi-kmod26/files/patch-drivers-dahdi-dahdi-base.c (contents, props changed) head/misc/dahdi-kmod26/files/patch-drivers-dahdi-wctc4xxp-base.c (contents, props changed) Added: head/misc/dahdi-kmod26/files/patch-drivers-dahdi-dahdi-base.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/dahdi-kmod26/files/patch-drivers-dahdi-dahdi-base.c Mon Nov 18 12:18:05 2013 (r334177) @@ -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 Added: head/misc/dahdi-kmod26/files/patch-drivers-dahdi-wctc4xxp-base.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/dahdi-kmod26/files/patch-drivers-dahdi-wctc4xxp-base.c Mon Nov 18 12:18:05 2013 (r334177) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311181218.rAICI5HS076428>