Correctly allow chan_dahdi to compile against older versions of Zaptel.

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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 60b6d2d9ff3a458aa924603f264524d86e8f2174..5bd2bd9f71517c8d29718b0e45186620b93230e5 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -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;

diff --git a/configure b/configure
index c6bbbf730bcc4cfd66e913d076dce13b211e1ee1..96f17c6af76d3bef944d9bc09d42553924d6fa61 100755 (executable)
--- a/configure
+++ b/configure
@@ -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

diff --git a/configure.ac b/configure.ac
index d73b99d130c91b4c26ffc543a47f9cc7f9129f73..de742f95be8270ab6803f5f8771e0dc5c0f7c8f9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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

diff --git a/main/asterisk.c b/main/asterisk.c
index cee50d6770a30443f396b025259b50c8f2aa7802..c7fe4b82e637da920fd5eb814cbb1797db9fe43d 100644 (file)
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -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

diff --git a/main/channel.c b/main/channel.c
index 1f92ed97f20eaaf1aa3272bcfa1efbdffec7a534..f2383104183af9704b42b242bf09b336acf9e53d 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -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