[asterisk-commits] rizzo: trunk r51292 - in /trunk: apps/ channels/ res/

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Fri Jan 19 10:16:19 2007
New Revision: 51292

URL: http://svn.digium.com/view/asterisk?view=rev&rev=51292
Log:
include "asterisk/zapata.h" instead of looking
directly for the zaptel.h and tonezone.h


Modified:
    trunk/apps/app_flash.c
    trunk/apps/app_rpt.c
    trunk/apps/app_zapbarge.c
    trunk/apps/app_zapras.c
    trunk/apps/app_zapscan.c
    trunk/channels/chan_iax2.c
    trunk/res/res_musiconhold.c

Modified: trunk/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_flash.c?view=diff&rev=51292&r1=51291&r2=51292
==============================================================================
--- trunk/apps/app_flash.c (original)
+++ trunk/apps/app_flash.c Fri Jan 19 10:16:19 2007
@@ -37,8 +37,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/ioctl.h>
-#include <zaptel/zaptel.h>
+#include "asterisk/zapata.h"
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"

Modified: trunk/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_rpt.c?view=diff&rev=51292&r1=51291&r2=51292
==============================================================================
--- trunk/apps/app_rpt.c (original)
+++ trunk/apps/app_rpt.c Fri Jan 19 10:16:19 2007
@@ -221,8 +221,6 @@
 #include <sys/ioctl.h>
 #include <sys/io.h>
 #include <math.h>
-#include <zaptel/zaptel.h>
-#include <zaptel/tonezone.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
@@ -242,6 +240,8 @@
 #include "asterisk/say.h"
 #include "asterisk/localtime.h"
 #include "asterisk/app.h"
+
+#include "asterisk/zapata.h"
 
 static char *app = "Rpt";
 

Modified: trunk/apps/app_zapbarge.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_zapbarge.c?view=diff&rev=51292&r1=51291&r2=51292
==============================================================================
--- trunk/apps/app_zapbarge.c (original)
+++ trunk/apps/app_zapbarge.c Fri Jan 19 10:16:19 2007
@@ -44,8 +44,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include <sys/ioctl.h>
-#include <zaptel/zaptel.h>
+#include "asterisk/zapata.h"
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"

Modified: trunk/apps/app_zapras.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_zapras.c?view=diff&rev=51292&r1=51291&r2=51292
==============================================================================
--- trunk/apps/app_zapras.c (original)
+++ trunk/apps/app_zapras.c Fri Jan 19 10:16:19 2007
@@ -48,7 +48,8 @@
 #include <errno.h>
 #include <stdio.h>
 #include <fcntl.h>
-#include <zaptel/zaptel.h>
+
+#include "asterisk/zapata.h"
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"

Modified: trunk/apps/app_zapscan.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_zapscan.c?view=diff&rev=51292&r1=51291&r2=51292
==============================================================================
--- trunk/apps/app_zapscan.c (original)
+++ trunk/apps/app_zapscan.c Fri Jan 19 10:16:19 2007
@@ -43,8 +43,8 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include <sys/ioctl.h>
-#include <zaptel/zaptel.h>
+
+#include "asterisk/zapata.h"
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"

Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=51292&r1=51291&r2=51292
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Fri Jan 19 10:16:19 2007
@@ -58,10 +58,7 @@
 #include <sys/stat.h>
 #include <regex.h>
 
-#ifdef HAVE_ZAPTEL
-#include <sys/ioctl.h>
-#include <zaptel/zaptel.h>
-#endif
+#include "asterisk/zapata.h"
 
 #include "asterisk/lock.h"
 #include "asterisk/frame.h" 

Modified: trunk/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_musiconhold.c?view=diff&rev=51292&r1=51291&r2=51292
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Fri Jan 19 10:16:19 2007
@@ -49,9 +49,7 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 
-#ifdef HAVE_ZAPTEL
-#include <zaptel/zaptel.h>
-#endif
+#include "asterisk/zapata.h"
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"