[svn-commits] mattf: branch jsloan/stable-1.4 r3210 - in /team/jsloan/stable-1.4: ./ build_...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sat Nov 3 11:20:47 CDT 2007
Author: mattf
Date: Sat Nov 3 11:20:47 2007
New Revision: 3210
URL: http://svn.digium.com/view/zaptel?view=rev&rev=3210
Log:
Merged revisions 3185,3189-3190,3195,3198,3202,3206 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
................
r3185 | tzafrir | 2007-10-26 08:34:04 -0500 (Fri, 26 Oct 2007) | 2 lines
Remove obsolete drivers (replaced by wcusb).
................
r3189 | mattf | 2007-10-26 10:12:24 -0500 (Fri, 26 Oct 2007) | 9 lines
Merged revisions 3188 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r3188 | mattf | 2007-10-26 10:08:37 -0500 (Fri, 26 Oct 2007) | 1 line
Another clock polarity update. To fix garbage audio on some systems with the wctdm24xxp driver and VPMADT032
........
................
r3190 | tzafrir | 2007-10-26 10:36:05 -0500 (Fri, 26 Oct 2007) | 4 lines
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 .
................
r3195 | tzafrir | 2007-10-27 11:33:48 -0500 (Sat, 27 Oct 2007) | 3 lines
Detect SELinux support (for install target) in autoconf.
Can be manually overriden in configure or make.
................
r3198 | tzafrir | 2007-10-28 13:26:04 -0500 (Sun, 28 Oct 2007) | 6 lines
Firmware object file building does not depend anymore on another object
to be linked into the same module.
That dependency existed solely for checking target binary properties in
make_firmware_object . Those properties are now checked in autoconf.
................
r3202 | tzafrir | 2007-10-31 08:10:15 -0500 (Wed, 31 Oct 2007) | 2 lines
Blocking merge of r3201 which is a backport from 1.4 .
................
r3206 | mmichelson | 2007-10-31 16:09:21 -0500 (Wed, 31 Oct 2007) | 13 lines
Merged revisions 3205 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r3205 | mmichelson | 2007-10-31 16:08:15 -0500 (Wed, 31 Oct 2007) | 5 lines
Fixed potential buffer overflow.
See AST-2007-024 for more details
........
................
Added:
team/jsloan/stable-1.4/build_tools/make_firmware_object.in
- copied unchanged from r3206, branches/1.4/build_tools/make_firmware_object.in
Removed:
team/jsloan/stable-1.4/build_tools/make_firmware_object
team/jsloan/stable-1.4/wcfxsusb.c
team/jsloan/stable-1.4/wcfxsusb.h
Modified:
team/jsloan/stable-1.4/ (props changed)
team/jsloan/stable-1.4/Makefile
team/jsloan/stable-1.4/configure
team/jsloan/stable-1.4/configure.ac
team/jsloan/stable-1.4/firmware/Makefile
team/jsloan/stable-1.4/makeopts.in
team/jsloan/stable-1.4/sethdlc-new.c
team/jsloan/stable-1.4/sethdlc.c
team/jsloan/stable-1.4/tor2.c
team/jsloan/stable-1.4/wct4xxp/base.c
team/jsloan/stable-1.4/wctdm.c
team/jsloan/stable-1.4/wctdm24xxp/base.c
team/jsloan/stable-1.4/wcte11xp.c
team/jsloan/stable-1.4/wcte12xp.c
team/jsloan/stable-1.4/zaptel-base.c
team/jsloan/stable-1.4/ztdummy.c
Propchange: team/jsloan/stable-1.4/
------------------------------------------------------------------------------
--- branch-1.2-blocked (original)
+++ branch-1.2-blocked Sat Nov 3 11:20:47 2007
@@ -1,1 +1,1 @@
-/branches/1.2:917,937,1073,1206,1613,2018,2434,2583,2668,2750,2789,2868,2871,2878,3083,3098-3099
+/branches/1.2:917,937,1073,1206,1613,2018,2434,2583,2668,2750,2789,2868,2871,2878,3083,3098-3099,3201
Propchange: team/jsloan/stable-1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/jsloan/stable-1.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Nov 3 11:20:47 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-3174
+/branches/1.4:1-3209
Modified: team/jsloan/stable-1.4/Makefile
URL: http://svn.digium.com/view/zaptel/team/jsloan/stable-1.4/Makefile?view=diff&rev=3210&r1=3209&r2=3210
==============================================================================
--- team/jsloan/stable-1.4/Makefile (original)
+++ team/jsloan/stable-1.4/Makefile Sat Nov 3 11:20:47 2007
@@ -162,8 +162,6 @@
KFLAGS+=-mcmodel=kernel
endif
endif
-
-SELINUX_COND=[ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled")
#
# Features are now configured in zconfig.h
@@ -380,8 +378,6 @@
zaptel-base.o: digits.h arith.h sec.h mec.h sec-2.h mec2.h mec3.h zconfig.h
wcusb.o: wcusb.h
-
-wcfxsusb.o: wcfxsusb.h
wctdm.o: wctdm.h
@@ -484,8 +480,10 @@
$(DESTDIR)$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER)
$(LN) -sf $(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) \
$(DESTDIR)$(LIB_DIR)/$(LTZ_SO)
-ifeq (,$(DESTDIR))
- if $(SELINUX_COND); then /sbin/restorecon -v $(DESTDIR)$(LIB_DIR)/$(LTZ_SO); fi
+ifneq (no,$(USE_SELINUX))
+ ifeq (,$(DESTDIR))
+ /sbin/restorecon -v $(DESTDIR)$(LIB_DIR)/$(LTZ_SO)
+ endif
endif
$(INSTALL) -D -m 644 tonezone.h $(DESTDIR)$(INC_DIR)/tonezone.h
Modified: team/jsloan/stable-1.4/configure
URL: http://svn.digium.com/view/zaptel/team/jsloan/stable-1.4/configure?view=diff&rev=3210&r1=3209&r2=3210
==============================================================================
--- team/jsloan/stable-1.4/configure (original)
+++ team/jsloan/stable-1.4/configure Sat Nov 3 11:20:47 2007
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 2990 .
+# From configure.ac Revision: 3195 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
@@ -667,6 +667,8 @@
INSTALL_DATA
LN_S
GNU_MAKE
+BDFNAME
+BDFARCH
HOSTCC
GREP
LN
@@ -686,6 +688,7 @@
USB_LIB
USB_INCLUDE
PBX_LIBUSB
+USE_SELINUX
ASCIIDOC
PPPD_VERSION
LIBOBJS
@@ -1272,6 +1275,7 @@
--with-ncurses=PATH use ncurses files in PATH
--with-newt=PATH use newt files in PATH
--with-usb=PATH use libusb files in PATH
+ --with-selinux enable (with) / disable (without) SELinux
--with-ppp=PATH Use ppp support from PATH
Some influential environment variables:
@@ -3032,6 +3036,48 @@
+test_obj=conftest.o
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+
+ BDFNAME=`LANG=C objdump -f $test_obj | grep -e "$test_obj:" | sed "s/.*file format \(.*\)/\1/"`
+ BDFARCH=`LANG=C objdump -f $test_obj | grep -e "architecture:" | sed "s/.*ture: \(.*\),.*/\1/"`
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+
# Set the default value of HOSTCC from CC if --host was not provided:
HOSTCC=${HOSTCC:=${CC}}
@@ -3254,7 +3300,6 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
@@ -5328,6 +5373,24 @@
+
+# Check whether --with-selinux was given.
+if test "${with_selinux+set}" = set; then
+ withval=$with_selinux; USE_SELINUX=$withval
+else
+ if test ! -x /usr/sbin/sestatus; then
+ USE_SELINUX=no;
+ elif /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"; then
+ USE_SELINUX=yes
+ fi
+
+
+fi
+
+
+
+
+
# for asciidoc before ver. 7, the backend must be stated explicitly:
ASCIIDOC='asciidoc'
asciidoc_ver=`asciidoc --version 2>&1 | awk '/^asciidoc /{print $2}' | cut -d. -f 1 | head -n 1`
@@ -5375,7 +5438,7 @@
-ac_config_files="$ac_config_files build_tools/menuselect-deps makeopts"
+ac_config_files="$ac_config_files build_tools/menuselect-deps makeopts build_tools/make_firmware_object"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -5947,6 +6010,7 @@
case $ac_config_target in
"build_tools/menuselect-deps") CONFIG_FILES="$CONFIG_FILES build_tools/menuselect-deps" ;;
"makeopts") CONFIG_FILES="$CONFIG_FILES makeopts" ;;
+ "build_tools/make_firmware_object") CONFIG_FILES="$CONFIG_FILES build_tools/make_firmware_object" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -6057,6 +6121,8 @@
INSTALL_DATA!$INSTALL_DATA$ac_delim
LN_S!$LN_S$ac_delim
GNU_MAKE!$GNU_MAKE$ac_delim
+BDFNAME!$BDFNAME$ac_delim
+BDFARCH!$BDFARCH$ac_delim
HOSTCC!$HOSTCC$ac_delim
GREP!$GREP$ac_delim
LN!$LN$ac_delim
@@ -6076,13 +6142,14 @@
USB_LIB!$USB_LIB$ac_delim
USB_INCLUDE!$USB_INCLUDE$ac_delim
PBX_LIBUSB!$PBX_LIBUSB$ac_delim
+USE_SELINUX!$USE_SELINUX$ac_delim
ASCIIDOC!$ASCIIDOC$ac_delim
PPPD_VERSION!$PPPD_VERSION$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -6414,6 +6481,7 @@
$ac_cs_success || { (exit 1); exit 1; }
fi
+chmod a+x build_tools/make_firmware_object
{ echo "$as_me:$LINENO: *** Zaptel build successfully configured ***" >&5
echo "$as_me: *** Zaptel build successfully configured ***" >&6;}
Modified: team/jsloan/stable-1.4/configure.ac
URL: http://svn.digium.com/view/zaptel/team/jsloan/stable-1.4/configure.ac?view=diff&rev=3210&r1=3209&r2=3210
==============================================================================
--- team/jsloan/stable-1.4/configure.ac (original)
+++ team/jsloan/stable-1.4/configure.ac Sat Nov 3 11:20:47 2007
@@ -36,6 +36,14 @@
AC_PROG_LN_S
AST_CHECK_GNU_MAKE
+test_obj=conftest.o
+AC_COMPILE_IFELSE(AC_LANG_SOURCE(),[
+ BDFNAME=`LANG=C objdump -f $test_obj | grep -e "$test_obj:" | sed "s/.*file format \(.*\)/\1/"`
+ BDFARCH=`LANG=C objdump -f $test_obj | grep -e "architecture:" | sed "s/.*ture: \(.*\),.*/\1/"`
+],[])
+AC_SUBST(BDFNAME)
+AC_SUBST(BDFARCH)
+
# Set the default value of HOSTCC from CC if --host was not provided:
HOSTCC=${HOSTCC:=${CC}}
AC_SUBST(HOSTCC)
@@ -59,6 +67,21 @@
AST_EXT_LIB([ncurses], [initscr], [curses.h], [NCURSES], [ncurses], [])
AST_EXT_LIB([newt], [newtBell], [newt.h], [NEWT], [newt])
AST_EXT_LIB([usb], [usb_init], [usb.h], [USB], [libusb])
+
+AC_ARG_WITH(selinux,
+ [AS_HELP_STRING([--with-selinux],
+ [enable (with) / disable (without) SELinux])],
+ [USE_SELINUX=$withval],
+ [ if test ! -x /usr/sbin/sestatus; then
+ USE_SELINUX=no;
+ elif /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"; then
+ USE_SELINUX=yes
+ fi
+ ]
+)
+
+
+AC_SUBST(USE_SELINUX)
# for asciidoc before ver. 7, the backend must be stated explicitly:
ASCIIDOC='asciidoc'
@@ -101,8 +124,9 @@
AC_SUBST(PPPD_VERSION)
-AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])
+AC_CONFIG_FILES([build_tools/menuselect-deps makeopts build_tools/make_firmware_object])
AC_OUTPUT
+chmod a+x build_tools/make_firmware_object
AC_MSG_NOTICE(*** Zaptel build successfully configured ***)
Modified: team/jsloan/stable-1.4/firmware/Makefile
URL: http://svn.digium.com/view/zaptel/team/jsloan/stable-1.4/firmware/Makefile?view=diff&rev=3210&r1=3209&r2=3210
==============================================================================
--- team/jsloan/stable-1.4/firmware/Makefile (original)
+++ team/jsloan/stable-1.4/firmware/Makefile Sat Nov 3 11:20:47 2007
@@ -181,21 +181,21 @@
fi
# Build object file of an oct6114 064 firmware image for linking
-zaptel-fw-oct6114-064.o: zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz ../wct4xxp/base.o zaptel-fw-oct6114-064.bin
+zaptel-fw-oct6114-064.o: zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz zaptel-fw-oct6114-064.bin
@echo Making firmware object file for zaptel-fw-oct6114-064.bin
- ../build_tools/make_firmware_object zaptel-fw-oct6114-064.bin $@ ../wct4xxp/base.o
+ ../build_tools/make_firmware_object zaptel-fw-oct6114-064.bin $@
# Build object file of an oct6114 128 firmware image for linking
-zaptel-fw-oct6114-128.o: zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz ../wct4xxp/base.o zaptel-fw-oct6114-128.bin
+zaptel-fw-oct6114-128.o: zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz zaptel-fw-oct6114-128.bin
@echo Making firmware object file for zaptel-fw-oct6114-128.bin
- ../build_tools/make_firmware_object zaptel-fw-oct6114-128.bin $@ ../wct4xxp/base.o
+ ../build_tools/make_firmware_object zaptel-fw-oct6114-128.bin $@
# Build object file of a TC400M firmware image for linking
-zaptel-fw-tc400m.o: zaptel-fw-tc400m-$(TC400M_VERSION).tar.gz ../wctc4xxp/base.o zaptel-fw-tc400m.bin
+zaptel-fw-tc400m.o: zaptel-fw-tc400m-$(TC400M_VERSION).tar.gz zaptel-fw-tc400m.bin
@echo Making firmware object file for zaptel-fw-tc400m.bin
- ../build_tools/make_firmware_object zaptel-fw-tc400m.bin $@ ../wctc4xxp/base.o
+ ../build_tools/make_firmware_object zaptel-fw-tc400m.bin $@
# Build object file of a VPMADT032 firmware image for linking
-zaptel-fw-vpmadt032.o: zaptel-fw-vpmadt032-$(VPMADT032_VERSION).tar.gz ../wctdm24xxp/base.o zaptel-fw-vpmadt032.bin
+zaptel-fw-vpmadt032.o: zaptel-fw-vpmadt032-$(VPMADT032_VERSION).tar.gz zaptel-fw-vpmadt032.bin
@echo Making firmware object file for zaptel-fw-vpmadt032.bin
- ../build_tools/make_firmware_object zaptel-fw-vpmadt032.bin $@ ../wctdm24xxp/base.o
+ ../build_tools/make_firmware_object zaptel-fw-vpmadt032.bin $@
Modified: team/jsloan/stable-1.4/makeopts.in
URL: http://svn.digium.com/view/zaptel/team/jsloan/stable-1.4/makeopts.in?view=diff&rev=3210&r1=3209&r2=3210
==============================================================================
--- team/jsloan/stable-1.4/makeopts.in (original)
+++ team/jsloan/stable-1.4/makeopts.in Sat Nov 3 11:20:47 2007
@@ -39,6 +39,8 @@
USB_LIB=@USB_LIB@
USB_INCLUDE=@USB_INCLUDE@
+USE_SELINUX=@USE_SELINUX@
+
PPPD_VERSION=@PPPD_VERSION@
ASCIIDOC=@ASCIIDOC@
Modified: team/jsloan/stable-1.4/sethdlc-new.c
URL: http://svn.digium.com/view/zaptel/team/jsloan/stable-1.4/sethdlc-new.c?view=diff&rev=3210&r1=3209&r2=3210
==============================================================================
--- team/jsloan/stable-1.4/sethdlc-new.c (original)
+++ team/jsloan/stable-1.4/sethdlc-new.c Sat Nov 3 11:20:47 2007
@@ -673,7 +673,7 @@
if (sock < 0)
error("Unable to create socket: %s\n", strerror(errno));
- strcpy(req.ifr_name, argv[1]); /* Device name */
+ strncpy(req.ifr_name, argv[1], sizeof(req.ifr_name) - 1); /* Device name */
if (argc == 2)
show_port();
Modified: team/jsloan/stable-1.4/sethdlc.c
URL: http://svn.digium.com/view/zaptel/team/jsloan/stable-1.4/sethdlc.c?view=diff&rev=3210&r1=3209&r2=3210
==============================================================================
--- team/jsloan/stable-1.4/sethdlc.c (original)
+++ team/jsloan/stable-1.4/sethdlc.c Sat Nov 3 11:20:47 2007
@@ -293,7 +293,7 @@
if (sock<0)
error("Unable to create socket: %s\n", strerror(errno));
- strcpy(req.ifr_name, argv[1]); /* Device name */
+ strncpy(req.ifr_name, argv[1], sizeof(req.ifr_name) - 1); /* Device name */
if (argc == 2) {
show_port(sock);
Modified: team/jsloan/stable-1.4/tor2.c
URL: http://svn.digium.com/view/zaptel/team/jsloan/stable-1.4/tor2.c?view=diff&rev=3210&r1=3209&r2=3210
==============================================================================
--- team/jsloan/stable-1.4/tor2.c (original)
+++ team/jsloan/stable-1.4/tor2.c Sat Nov 3 11:20:47 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: team/jsloan/stable-1.4/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/jsloan/stable-1.4/wct4xxp/base.c?view=diff&rev=3210&r1=3209&r2=3210
==============================================================================
--- team/jsloan/stable-1.4/wct4xxp/base.c (original)
+++ team/jsloan/stable-1.4/wct4xxp/base.c Sat Nov 3 11:20:47 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: team/jsloan/stable-1.4/wctdm.c
URL: http://svn.digium.com/view/zaptel/team/jsloan/stable-1.4/wctdm.c?view=diff&rev=3210&r1=3209&r2=3210
==============================================================================
--- team/jsloan/stable-1.4/wctdm.c (original)
+++ team/jsloan/stable-1.4/wctdm.c Sat Nov 3 11:20:47 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: team/jsloan/stable-1.4/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/jsloan/stable-1.4/wctdm24xxp/base.c?view=diff&rev=3210&r1=3209&r2=3210
==============================================================================
--- team/jsloan/stable-1.4/wctdm24xxp/base.c (original)
+++ team/jsloan/stable-1.4/wctdm24xxp/base.c Sat Nov 3 11:20:47 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>
@@ -3363,7 +3359,7 @@
portconfig.TxFrameSyncPolarity2 = FrameSyncActHigh;
portconfig.RxFrameSyncPolarity2 = FrameSyncActHigh;
portconfig.TxClockPolarity2 = SerClockActHigh;
- portconfig.RxClockPolarity2 = SerClockActHigh;
+ portconfig.RxClockPolarity2 = SerClockActLow;
portconfig.TxDataDelay2 = DataDelay0;
portconfig.RxDataDelay2 = DataDelay0;
portconfig.DxDelay2 = Disabled;
Modified: team/jsloan/stable-1.4/wcte11xp.c
URL: http://svn.digium.com/view/zaptel/team/jsloan/stable-1.4/wcte11xp.c?view=diff&rev=3210&r1=3209&r2=3210
==============================================================================
--- team/jsloan/stable-1.4/wcte11xp.c (original)
+++ team/jsloan/stable-1.4/wcte11xp.c Sat Nov 3 11:20:47 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: team/jsloan/stable-1.4/wcte12xp.c
URL: http://svn.digium.com/view/zaptel/team/jsloan/stable-1.4/wcte12xp.c?view=diff&rev=3210&r1=3209&r2=3210
==============================================================================
--- team/jsloan/stable-1.4/wcte12xp.c (original)
+++ team/jsloan/stable-1.4/wcte12xp.c Sat Nov 3 11:20:47 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: team/jsloan/stable-1.4/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/team/jsloan/stable-1.4/zaptel-base.c?view=diff&rev=3210&r1=3209&r2=3210
==============================================================================
--- team/jsloan/stable-1.4/zaptel-base.c (original)
+++ team/jsloan/stable-1.4/zaptel-base.c Sat Nov 3 11:20:47 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: team/jsloan/stable-1.4/ztdummy.c
URL: http://svn.digium.com/view/zaptel/team/jsloan/stable-1.4/ztdummy.c?view=diff&rev=3210&r1=3209&r2=3210
==============================================================================
--- team/jsloan/stable-1.4/ztdummy.c (original)
+++ team/jsloan/stable-1.4/ztdummy.c Sat Nov 3 11:20:47 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>
More information about the svn-commits
mailing list