kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-07 07:09:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

Correctly allow chan_dahdi to compile against older versions of Zaptel.

Browse Source 
Don't always define HAVE_ZAPTEL_CHANALARMS (since we check if it's defined..)
Minor cleanup to make things clear.

(closes issue #13726)
Reported by: tzafrir
Patches:
      dahdi_def.diff uploaded by tzafrir (license 46)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@150557 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2008-10-17 15:31:35 +00:00
parent 47cf653623
commit 979e2cd58d
5 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_dahdi.c
+2 -2
View File
@@ -3668,7 +3668,7 @@ static int get_alarms(struct dahdi_pvt *p)
{
int res;
struct dahdi_spaninfo zi;
#if defined(HAVE_DAHDI) || defined(HAVE_ZAPTEL_CHANALARMS)
#if !defined(HAVE_ZAPTEL) || defined(HAVE_ZAPTEL_CHANALARMS)
/*
* The conditional compilation is needed only in asterisk-1.4 for
* backward compatibility with old zaptel drivers that don't have
@@ -3687,7 +3687,7 @@ static int get_alarms(struct dahdi_pvt *p)
}
if (zi.alarms != DAHDI_ALARM_NONE)
return zi.alarms;
#if defined(HAVE_DAHDI) || defined(HAVE_ZAPTEL_CHANALARMS)
#if !defined(HAVE_ZAPTEL) || defined(HAVE_ZAPTEL_CHANALARMS)
/* No alarms on the span. Check for channel alarms. */
if ((res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_GET_PARAMS, &params)) >= 0)
return params.chan_alarms;
configure
Vendored
+8 -10
View File
@@ -12126,11 +12126,13 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
#include <sys/types.h> /* for off_t */
#include <stdio.h>
int
main ()
{
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
int (*fp) (FILE *, off_t, int) = fseeko;
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
;
return 0;
}
@@ -12170,11 +12172,13 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
#include <sys/types.h> /* for off_t */
#include <stdio.h>
int
main ()
{
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
int (*fp) (FILE *, off_t, int) = fseeko;
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
;
return 0;
}
@@ -30574,12 +30578,6 @@ echo "${ECHO_T}$ac_cv_member_ZT_PARAMS_chan_alarms" >&6; }
cat >>confdefs.h <<\_ACEOF
#define HAVE_ZAPTEL_CHANALARMS 1
_ACEOF
else
cat >>confdefs.h <<\_ACEOF
#define HAVE_ZAPTEL_CHANALARMS 0
_ACEOF
fi
configure.ac
-2
View File
@@ -1464,8 +1464,6 @@ if test "${USE_ZAPTEL}" != "no" && test "x${PBX_DAHDI}" != "x1"; then
CPPFLAGS="${saved_cppflags}"
if test "${ac_cv_member_ZT_PARAMS_chan_alarms}" = "yes"; then
AC_DEFINE([HAVE_ZAPTEL_CHANALARMS], 1, [Define if your Zaptel drivers have chan_alarms.])
else
AC_DEFINE([HAVE_ZAPTEL_CHANALARMS], 0, [Define if your Zaptel drivers have chan_alarms.])
fi
elif test -n "${ZAPTEL_MANDATORY}";
then
main/asterisk.c
+1 -1
View File
@@ -74,7 +74,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <pwd.h>
#include <sys/stat.h>
#if defined(HAVE_ZAPTEL) || defined (HAVE_DAHDI)
#if defined(HAVE_DAHDI)
#include <sys/ioctl.h>
#include "asterisk/dahdi_compat.h"
#endif
main/channel.c
+1 -1
View File
@@ -37,7 +37,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <unistd.h>
#include <math.h>
#if defined(HAVE_ZAPTEL) || defined (HAVE_DAHDI)
#if defined(HAVE_DAHDI)
#include <sys/ioctl.h>
#include "asterisk/dahdi_compat.h"
#endif