[zaptel-commits] tzafrir: branch 1.4 r3190 - in /branches/1.4: ./ wct4xxp/ wctdm24xxp/

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Fri Oct 26 10:36:05 2007
New Revision: 3190

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3190
Log:
If you depend on anything that is not in /usr/include/zaptel , you must 
build with the local zaptel.h . Otherwise you may mix two versions of
Zaptel .

Modified:
    branches/1.4/tor2.c
    branches/1.4/wct4xxp/base.c
    branches/1.4/wctdm.c
    branches/1.4/wctdm24xxp/base.c
    branches/1.4/wcte11xp.c
    branches/1.4/wcte12xp.c
    branches/1.4/zaptel-base.c
    branches/1.4/ztdummy.c

Modified: branches/1.4/tor2.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/tor2.c?view=diff&rev=3190&r1=3189&r2=3190
==============================================================================
--- branches/1.4/tor2.c (original)
+++ branches/1.4/tor2.c Fri Oct 26 10:36:05 2007
@@ -32,11 +32,7 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
-#ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
-#else
-#include <zaptel/zaptel.h>
-#endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
 #endif

Modified: branches/1.4/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wct4xxp/base.c?view=diff&rev=3190&r1=3189&r2=3190
==============================================================================
--- branches/1.4/wct4xxp/base.c (original)
+++ branches/1.4/wct4xxp/base.c Fri Oct 26 10:36:05 2007
@@ -37,11 +37,7 @@
 #include <asm/io.h>
 #include <linux/version.h>
 #include <linux/delay.h>
-#ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
-#else
-#include <zaptel/zaptel.h>
-#endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
 #endif

Modified: branches/1.4/wctdm.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctdm.c?view=diff&rev=3190&r1=3189&r2=3190
==============================================================================
--- branches/1.4/wctdm.c (original)
+++ branches/1.4/wctdm.c Fri Oct 26 10:36:05 2007
@@ -201,11 +201,7 @@
 	{ "YEMEN", 0, 0, 0, 0, 0, 0x3, 0, 0, },
 };
 
-#ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
-#else
-#include <zaptel/zaptel.h>
-#endif
 
 #ifdef LINUX26
 #include <linux/moduleparam.h>

Modified: branches/1.4/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctdm24xxp/base.c?view=diff&rev=3190&r1=3189&r2=3190
==============================================================================
--- branches/1.4/wctdm24xxp/base.c (original)
+++ branches/1.4/wctdm24xxp/base.c Fri Oct 26 10:36:05 2007
@@ -234,11 +234,7 @@
 	{ "YEMEN", 0, 0, 0, 0, 0, 0x3, 0, 0, },
 };
 
-#ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
-#else
-#include <zaptel/zaptel.h>
-#endif
 
 #ifdef LINUX26
 #include <linux/moduleparam.h>

Modified: branches/1.4/wcte11xp.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wcte11xp.c?view=diff&rev=3190&r1=3189&r2=3190
==============================================================================
--- branches/1.4/wcte11xp.c (original)
+++ branches/1.4/wcte11xp.c Fri Oct 26 10:36:05 2007
@@ -32,11 +32,7 @@
 #include <linux/errno.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
-#ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
-#else
-#include <zaptel/zaptel.h>
-#endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
 #endif

Modified: branches/1.4/wcte12xp.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wcte12xp.c?view=diff&rev=3190&r1=3189&r2=3190
==============================================================================
--- branches/1.4/wcte12xp.c (original)
+++ branches/1.4/wcte12xp.c Fri Oct 26 10:36:05 2007
@@ -37,11 +37,7 @@
 #include <linux/interrupt.h>
 #include <linux/proc_fs.h>
 
-#ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
-#else
-#include <zaptel/zaptel.h>
-#endif
 
 #ifdef LINUX26
 #include <linux/moduleparam.h>

Modified: branches/1.4/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/zaptel-base.c?view=diff&rev=3190&r1=3189&r2=3190
==============================================================================
--- branches/1.4/zaptel-base.c (original)
+++ branches/1.4/zaptel-base.c Fri Oct 26 10:36:05 2007
@@ -77,11 +77,7 @@
 #define FAST_HDLC_NEED_TABLES
 #include "fasthdlc.h"
 
-#ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
-#else
-#include <zaptel/zaptel.h>
-#endif
 
 #ifdef LINUX26
 #include <linux/moduleparam.h>

Modified: branches/1.4/ztdummy.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/ztdummy.c?view=diff&rev=3190&r1=3189&r2=3190
==============================================================================
--- branches/1.4/ztdummy.c (original)
+++ branches/1.4/ztdummy.c Fri Oct 26 10:36:05 2007
@@ -74,11 +74,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/errno.h>
-#ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
-#else
-#include <zaptel/zaptel.h>
-#endif
 #ifndef LINUX26
 #include <linux/usb.h>
 #include <linux/pci.h>