[asterisk-bugs] [Asterisk 0012938]: [patch] Compile failure on tonezone_compat.h with zaptel 1.4 and asterisk 1.4

[noreply at bugs.digium.com]

A NOTE has been added to this issue. 
====================================================================== 
http://bugs.digium.com/view.php?id=12938 
====================================================================== 
Reported By:                opticron
Assigned To:                
====================================================================== 
Project:                    Asterisk
Issue ID:                   12938
Category:                   Channels/chan_zap
Reproducibility:            always
Severity:                   minor
Priority:                   normal
Status:                     new
Asterisk Version:           SVN 
SVN Branch (only for SVN checkouts, not tarball releases):  1.4  
SVN Revision (number only!): 125742 
Disclaimer on File?:        N/A 
Request Review:              
====================================================================== 
Date Submitted:             06-27-2008 09:28 CDT
Last Modified:              06-27-2008 11:39 CDT
====================================================================== 
Summary:                    [patch] Compile failure on tonezone_compat.h with
zaptel 1.4 and asterisk 1.4
Description: 
When installing zaptel 1.4 from SVN (r4365) and asterisk 1.4 from svn
(r125742), there is a compile error caused by a combination of the logic in
dahdi_compat.h and tonezone_compat.h.  dahdi_compat does "#define
HAVE_DAHDI HAVE_ZAPTEL" and tonezone_compat.h checks for HAVE_DAHDI first,
causing it to erroneously include "dahdi/tonezone.h".  Swapping the order
of the search fixes the issue.
====================================================================== 

---------------------------------------------------------------------- 
 svnbot - 06-27-08 11:39  
---------------------------------------------------------------------- 
Repository: asterisk
Revision: 125893

U   branches/1.4/include/asterisk/tonezone_compat.h

------------------------------------------------------------------------
r125893 | tilghman | 2008-06-27 11:38:59 -0500 (Fri, 27 Jun 2008) | 7
lines

Since HAVE_DAHDI is defined to HAVE_ZAPTEL in dahdi_compat.h, we must
first
check for HAVE_ZAPTEL.
(closes issue http://bugs.digium.com/view.php?id=12938)
 Reported by: opticron
 Patches: 
       tonezone_compat.diff uploaded by opticron (license 267)

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=125893 

Issue History 
Date Modified   Username       Field                    Change               
====================================================================== 
06-27-08 11:39  svnbot         Checkin                                      
06-27-08 11:39  svnbot         Note Added: 0089364                          
======================================================================