[zaptel-commits] trunk r1211 - in /trunk/xpp: Makefile xpp_zap.c zap_debug.c

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Fri Jul  7 19:31:41 2006
New Revision: 1211

URL: http://svn.digium.com/view/zaptel?rev=1211&view=rev
Log:
just #include "zaptel.h". No STANDALONE_ZAPATA or other strange stuff.

Modified:
    trunk/xpp/Makefile
    trunk/xpp/xpp_zap.c
    trunk/xpp/zap_debug.c

Modified: trunk/xpp/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/xpp/Makefile?rev=1211&r1=1210&r2=1211&view=diff
==============================================================================
--- trunk/xpp/Makefile (original)
+++ trunk/xpp/Makefile Fri Jul  7 19:31:41 2006
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS	= -I$(SUBDIRS) -DDEBUG -DPOLL_DIGITAL_INPUTS -DWITH_ECHO_SUPPRESSION -DWITH_RBS -DSTANDALONE_ZAPATA
+EXTRA_CFLAGS	= -I$(SUBDIRS) -DDEBUG -DPOLL_DIGITAL_INPUTS -DWITH_ECHO_SUPPRESSION -DWITH_RBS
 
 obj-m			= xpp.o xpp_usb.o xpd_fxs.o xpd_fxo.o
 xpp-y			+= xbus-core.o xpp_zap.o xproto.o card_global.o

Modified: trunk/xpp/xpp_zap.c
URL: http://svn.digium.com/view/zaptel/trunk/xpp/xpp_zap.c?rev=1211&r1=1210&r2=1211&view=diff
==============================================================================
--- trunk/xpp/xpp_zap.c (original)
+++ trunk/xpp/xpp_zap.c Fri Jul  7 19:31:41 2006
@@ -39,11 +39,7 @@
 #include <linux/workqueue.h>
 #include <linux/proc_fs.h>
 
-#ifdef STANDALONE_ZAPATA
-#include "../zaptel.h"
-#else
-#include <zaptel/zaptel.h>
-#endif
+#include "zaptel.h"
 
 #include <version.h>		/* For zaptel version */
 #include "xbus-core.h"

Modified: trunk/xpp/zap_debug.c
URL: http://svn.digium.com/view/zaptel/trunk/xpp/zap_debug.c?rev=1211&r1=1210&r2=1211&view=diff
==============================================================================
--- trunk/xpp/zap_debug.c (original)
+++ trunk/xpp/zap_debug.c Fri Jul  7 19:31:41 2006
@@ -28,7 +28,7 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/module.h>
-#include <zaptel.h>
+#include "zaptel.h"
 #include "zap_debug.h"
 
 static const char rcsid[] = "$Id$";