Merged revisions 134260 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r134260 | kpfleming | 2008-07-29 17:22:13 -0500 (Tue, 29 Jul 2008) | 2 lines

build against the now-typedef-free dahdi/user.h, and remove some #ifdefs for features that will always be present in DAHDI

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-07-29 22:29:11 +00:00
parent 2e8d6fc9b8
commit 25fe3c40f1
6 changed files with 309 additions and 77 deletions

View File

@@ -191,7 +191,7 @@ static int dahdiras_exec(struct ast_channel *chan, void *data)
{
int res=-1;
char *args;
DAHDI_PARAMS dahdip;
struct dahdi_params dahdip;
if (!data)
data = "";