[svn-commits] kpfleming: trunk r201 - /trunk/

SVN commits to the Digium repositories svn-commits at lists.digium.com
Tue Aug 5 17:27:46 CDT 2008


Author: kpfleming
Date: Tue Aug  5 17:27:45 2008
New Revision: 201

URL: http://svn.digium.com/view/libss7?view=rev&rev=201
Log:
clean up license headers

explicitly grant additional license permissions when used with Asterisk

build ss7test and ss7linktest when DAHDI is found, not Zaptel

stop using DAHDI typedefs that no longer exist


Modified:
    trunk/Makefile
    trunk/isup.c
    trunk/isup.h
    trunk/libss7.h
    trunk/mtp2.c
    trunk/mtp2.h
    trunk/mtp3.c
    trunk/mtp3.h
    trunk/parser_debug.c
    trunk/ss7.c
    trunk/ss7_internal.h
    trunk/ss7_sched.c
    trunk/ss7linktest.c
    trunk/ss7test.c

Modified: trunk/Makefile
URL: http://svn.digium.com/view/libss7/trunk/Makefile?view=diff&rev=201&r1=200&r2=201
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Aug  5 17:27:45 2008
@@ -18,8 +18,8 @@
 
 UTILITIES=parser_debug
 
-ifneq ($(wildcard /usr/include/zaptel/zaptel.h),)
-	UTILITIES+=ss7test ss7linktest
+ifneq ($(wildcard /usr/include/dahdi/user.h),)
+UTILITIES+=ss7test ss7linktest
 endif
 
 export SS7VERSION
@@ -80,3 +80,6 @@
 
 FORCE:
 
+ifneq ($(wildcard .*.d),)
+   include .*.d
+endif

Modified: trunk/isup.c
URL: http://svn.digium.com/view/libss7/trunk/isup.c?view=diff&rev=201&r1=200&r2=201
==============================================================================
--- trunk/isup.c (original)
+++ trunk/isup.c Tue Aug  5 17:27:45 2008
@@ -1,17 +1,33 @@
 /*
-libss7: An implementation of Signalling System 7
-
-Written by Matthew Fredrickson <creslin at digium.com>
-
-Copyright Digium, Inc. (C) 2006
-All Rights Reserved.
-
-This program is free software; you can redistribute it under the
-terms of the GNU General Public License as published by the Free
-Software Foundation
-
-Contains definitions and data structurs for the ISUP portion of SS7
-*/
+ * libss7: An implementation of Signalling System 7
+ *
+ * Written by Matthew Fredrickson <creslin at digium.com>
+ *
+ * scheduling routines taken from libpri by Mark Spencer <markster at digium.com>
+ *
+ * Copyright (C) 2006-2008, Digium, Inc
+ * All Rights Reserved.
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
+ *
+ * In addition, when this program is distributed with Asterisk in
+ * any form that would qualify as a 'combined work' or as a
+ * 'derivative work' (but not mere aggregation), you can redistribute
+ * and/or modify the combination under the terms of the license
+ * provided with that copy of Asterisk, instead of the license
+ * terms granted here.
+ */
 
 #include <string.h>
 #include <stdlib.h>

Modified: trunk/isup.h
URL: http://svn.digium.com/view/libss7/trunk/isup.h?view=diff&rev=201&r1=200&r2=201
==============================================================================
--- trunk/isup.h (original)
+++ trunk/isup.h Tue Aug  5 17:27:45 2008
@@ -1,17 +1,34 @@
 /*
-libss7: An implementation of Signalling System 7
-
-Written by Matthew Fredrickson <creslin at digium.com>
-
-Copyright Digium, Inc. (C) 2006
-All Rights Reserved.
-
-This program is free software; you can redistribute it under the
-terms of the GNU General Public License as published by the Free
-Software Foundation
-
-Contains definitions and data structurs for the ISUP portion of SS7
-*/
+ * libss7: An implementation of Signalling System 7
+ *
+ * Written by Matthew Fredrickson <creslin at digium.com>
+ *
+ * scheduling routines taken from libpri by Mark Spencer <markster at digium.com>
+ *
+ * Copyright (C) 2006-2008, Digium, Inc
+ * All Rights Reserved.
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
+ *
+ * In addition, when this program is distributed with Asterisk in
+ * any form that would qualify as a 'combined work' or as a
+ * 'derivative work' (but not mere aggregation), you can redistribute
+ * and/or modify the combination under the terms of the license
+ * provided with that copy of Asterisk, instead of the license
+ * terms granted here.
+ */
+
 #ifndef _SS7_ISUP_H
 #define _SS7_ISUP_H
 

Modified: trunk/libss7.h
URL: http://svn.digium.com/view/libss7/trunk/libss7.h?view=diff&rev=201&r1=200&r2=201
==============================================================================
--- trunk/libss7.h (original)
+++ trunk/libss7.h Tue Aug  5 17:27:45 2008
@@ -1,16 +1,34 @@
 /*
-libss7: An implementation of Signaling System 7
-
-Written by Matthew Fredrickson <creslin at digium.com>
-
-Copyright Digium, Inc. (C), 2006
-All Rights Reserved.
-
-This program is free software; you can redistribute it under the
-terms of the GNU General Public License as published by the Free
-Software Foundation
-
-*/
+ * libss7: An implementation of Signalling System 7
+ *
+ * Written by Matthew Fredrickson <creslin at digium.com>
+ *
+ * scheduling routines taken from libpri by Mark Spencer <markster at digium.com>
+ *
+ * Copyright (C) 2006-2008, Digium, Inc
+ * All Rights Reserved.
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
+ *
+ * In addition, when this program is distributed with Asterisk in
+ * any form that would qualify as a 'combined work' or as a
+ * 'derivative work' (but not mere aggregation), you can redistribute
+ * and/or modify the combination under the terms of the license
+ * provided with that copy of Asterisk, instead of the license
+ * terms granted here.
+ */
+
 #ifndef _LIBSS7_H
 #define _LIBSS7_H
 

Modified: trunk/mtp2.c
URL: http://svn.digium.com/view/libss7/trunk/mtp2.c?view=diff&rev=201&r1=200&r2=201
==============================================================================
--- trunk/mtp2.c (original)
+++ trunk/mtp2.c Tue Aug  5 17:27:45 2008
@@ -1,17 +1,33 @@
 /*
-libss7: An implementation of Signaling System 7
-
-Written by Matthew Fredrickson <creslin at digium.com>
-
-Copyright Digium, Inc. (C), 2006
-All Rights Reserved.
-
-This program is free software; you can redistribute it under the
-terms of the GNU General Public License as published by the Free
-Software Foundation
-
-Contains user interface to ss7 library
-*/
+ * libss7: An implementation of Signalling System 7
+ *
+ * Written by Matthew Fredrickson <creslin at digium.com>
+ *
+ * scheduling routines taken from libpri by Mark Spencer <markster at digium.com>
+ *
+ * Copyright (C) 2006-2008, Digium, Inc
+ * All Rights Reserved.
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
+ *
+ * In addition, when this program is distributed with Asterisk in
+ * any form that would qualify as a 'combined work' or as a
+ * 'derivative work' (but not mere aggregation), you can redistribute
+ * and/or modify the combination under the terms of the license
+ * provided with that copy of Asterisk, instead of the license
+ * terms granted here.
+ */
 
 #include "ss7_internal.h"
 #include "mtp3.h"

Modified: trunk/mtp2.h
URL: http://svn.digium.com/view/libss7/trunk/mtp2.h?view=diff&rev=201&r1=200&r2=201
==============================================================================
--- trunk/mtp2.h (original)
+++ trunk/mtp2.h Tue Aug  5 17:27:45 2008
@@ -1,15 +1,34 @@
 /*
-libss7: An implementation of Signalling System 7
+ * libss7: An implementation of Signalling System 7
+ *
+ * Written by Matthew Fredrickson <creslin at digium.com>
+ *
+ * scheduling routines taken from libpri by Mark Spencer <markster at digium.com>
+ *
+ * Copyright (C) 2006-2008, Digium, Inc
+ * All Rights Reserved.
+ */
 
-Written by Matthew Fredrickson <creslin at digium.com>
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
+ *
+ * In addition, when this program is distributed with Asterisk in
+ * any form that would qualify as a 'combined work' or as a
+ * 'derivative work' (but not mere aggregation), you can redistribute
+ * and/or modify the combination under the terms of the license
+ * provided with that copy of Asterisk, instead of the license
+ * terms granted here.
+ */
 
-Copyright Digium, Inc. (C) 2006
-All Rights Reserved.
-
-This program is free software; you can redistribute it under the
-terms of the GNU General Public License as published by the Free
-Software Foundation
-*/
 #ifndef _SS7_MTP_H
 #define _SS7_MTP_H
 

Modified: trunk/mtp3.c
URL: http://svn.digium.com/view/libss7/trunk/mtp3.c?view=diff&rev=201&r1=200&r2=201
==============================================================================
--- trunk/mtp3.c (original)
+++ trunk/mtp3.c Tue Aug  5 17:27:45 2008
@@ -1,16 +1,34 @@
 /*
-libss7: An implementation of Signaling System 7
-
-Written by Matthew Fredrickson <creslin at digium.com>
-
-Copyright Digium, Inc. (C), 2006
-All Rights Reserved.
-
-This program is free software; you can redistribute it under the
-terms of the GNU General Public License as published by the Free
-Software Foundation
-
-*/
+ * libss7: An implementation of Signalling System 7
+ *
+ * Written by Matthew Fredrickson <creslin at digium.com>
+ *
+ * scheduling routines taken from libpri by Mark Spencer <markster at digium.com>
+ *
+ * Copyright (C) 2006-2008, Digium, Inc
+ * All Rights Reserved.
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
+ *
+ * In addition, when this program is distributed with Asterisk in
+ * any form that would qualify as a 'combined work' or as a
+ * 'derivative work' (but not mere aggregation), you can redistribute
+ * and/or modify the combination under the terms of the license
+ * provided with that copy of Asterisk, instead of the license
+ * terms granted here.
+ */
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>

Modified: trunk/mtp3.h
URL: http://svn.digium.com/view/libss7/trunk/mtp3.h?view=diff&rev=201&r1=200&r2=201
==============================================================================
--- trunk/mtp3.h (original)
+++ trunk/mtp3.h Tue Aug  5 17:27:45 2008
@@ -1,16 +1,34 @@
 /*
-libss7: An implementation of Signaling System 7
+ * libss7: An implementation of Signalling System 7
+ *
+ * Written by Matthew Fredrickson <creslin at digium.com>
+ *
+ * scheduling routines taken from libpri by Mark Spencer <markster at digium.com>
+ *
+ * Copyright (C) 2006-2008, Digium, Inc
+ * All Rights Reserved.
+ */
 
-Written by Matthew Fredrickson <matt at fredricknet.net>
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
+ *
+ * In addition, when this program is distributed with Asterisk in
+ * any form that would qualify as a 'combined work' or as a
+ * 'derivative work' (but not mere aggregation), you can redistribute
+ * and/or modify the combination under the terms of the license
+ * provided with that copy of Asterisk, instead of the license
+ * terms granted here.
+ */
 
-Copyright Digium, Inc. (C), 2006
-All Rights Reserved.
-
-This program is free software; you can redistribute it under the
-terms of the GNU General Public License as published by the Free
-Software Foundation
-
-*/
 #ifndef _MTP3_H
 #define _MTP3_H
 

Modified: trunk/parser_debug.c
URL: http://svn.digium.com/view/libss7/trunk/parser_debug.c?view=diff&rev=201&r1=200&r2=201
==============================================================================
--- trunk/parser_debug.c (original)
+++ trunk/parser_debug.c Tue Aug  5 17:27:45 2008
@@ -1,3 +1,34 @@
+/*
+ * libss7: An implementation of Signalling System 7
+ *
+ * Written by Matthew Fredrickson <creslin at digium.com>
+ *
+ * scheduling routines taken from libpri by Mark Spencer <markster at digium.com>
+ *
+ * Copyright (C) 2006-2008, Digium, Inc
+ * All Rights Reserved.
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
+ *
+ * In addition, when this program is distributed with Asterisk in
+ * any form that would qualify as a 'combined work' or as a
+ * 'derivative work' (but not mere aggregation), you can redistribute
+ * and/or modify the combination under the terms of the license
+ * provided with that copy of Asterisk, instead of the license
+ * terms granted here.
+ */
+
 #include <stdio.h>
 #include <string.h>
 #include "libss7.h"

Modified: trunk/ss7.c
URL: http://svn.digium.com/view/libss7/trunk/ss7.c?view=diff&rev=201&r1=200&r2=201
==============================================================================
--- trunk/ss7.c (original)
+++ trunk/ss7.c Tue Aug  5 17:27:45 2008
@@ -1,17 +1,33 @@
 /*
-libss7: An implementation of Signalling System 7
-
-Written by Matthew Fredrickson <creslin at digium.com>
-
-Copyright Digium, Inc (C), 2006
-All Rights Reserved.
-
-This program is free software; you can redistribute it under the
-terms of the GNU General Public License as published by the Free
-Software Foundation
-
-Contains user interface to ss7 library
-*/
+ * libss7: An implementation of Signalling System 7
+ *
+ * Written by Matthew Fredrickson <creslin at digium.com>
+ *
+ * scheduling routines taken from libpri by Mark Spencer <markster at digium.com>
+ *
+ * Copyright (C) 2006-2008, Digium, Inc
+ * All Rights Reserved.
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
+ *
+ * In addition, when this program is distributed with Asterisk in
+ * any form that would qualify as a 'combined work' or as a
+ * 'derivative work' (but not mere aggregation), you can redistribute
+ * and/or modify the combination under the terms of the license
+ * provided with that copy of Asterisk, instead of the license
+ * terms granted here.
+ */
 
 #include <stdlib.h>
 #include <unistd.h>

Modified: trunk/ss7_internal.h
URL: http://svn.digium.com/view/libss7/trunk/ss7_internal.h?view=diff&rev=201&r1=200&r2=201
==============================================================================
--- trunk/ss7_internal.h (original)
+++ trunk/ss7_internal.h Tue Aug  5 17:27:45 2008
@@ -1,16 +1,34 @@
 /*
-libss7: An implementation of Signaling System 7
+ * libss7: An implementation of Signalling System 7
+ *
+ * Written by Matthew Fredrickson <creslin at digium.com>
+ *
+ * scheduling routines taken from libpri by Mark Spencer <markster at digium.com>
+ *
+ * Copyright (C) 2006-2008, Digium, Inc
+ * All Rights Reserved.
+ */
 
-Written by Matthew Fredrickson <creslin at digium.com>
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
+ *
+ * In addition, when this program is distributed with Asterisk in
+ * any form that would qualify as a 'combined work' or as a
+ * 'derivative work' (but not mere aggregation), you can redistribute
+ * and/or modify the combination under the terms of the license
+ * provided with that copy of Asterisk, instead of the license
+ * terms granted here.
+ */
 
-Copyright Digium, Inc. (C), 2006
-All Rights Reserved.
-
-This program is free software; you can redistribute it under the
-terms of the GNU General Public License as published by the Free
-Software Foundation
-
-*/
 #ifndef _SS7_H
 #define _SS7_H
 

Modified: trunk/ss7_sched.c
URL: http://svn.digium.com/view/libss7/trunk/ss7_sched.c?view=diff&rev=201&r1=200&r2=201
==============================================================================
--- trunk/ss7_sched.c (original)
+++ trunk/ss7_sched.c Tue Aug  5 17:27:45 2008
@@ -5,23 +5,28 @@
  *
  * scheduling routines taken from libpri by Mark Spencer <markster at digium.com>
  *
- * Copyright (C) 2005, Digium, Inc
+ * Copyright (C) 2006-2008, Digium, Inc
  * All Rights Reserved.
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
  *
+ * In addition, when this program is distributed with Asterisk in
+ * any form that would qualify as a 'combined work' or as a
+ * 'derivative work' (but not mere aggregation), you can redistribute
+ * and/or modify the combination under the terms of the license
+ * provided with that copy of Asterisk, instead of the license
+ * terms granted here.
  */
 
 #include "libss7.h"

Modified: trunk/ss7linktest.c
URL: http://svn.digium.com/view/libss7/trunk/ss7linktest.c?view=diff&rev=201&r1=200&r2=201
==============================================================================
--- trunk/ss7linktest.c (original)
+++ trunk/ss7linktest.c Tue Aug  5 17:27:45 2008
@@ -1,3 +1,34 @@
+/*
+ * libss7: An implementation of Signalling System 7
+ *
+ * Written by Matthew Fredrickson <creslin at digium.com>
+ *
+ * scheduling routines taken from libpri by Mark Spencer <markster at digium.com>
+ *
+ * Copyright (C) 2006-2008, Digium, Inc
+ * All Rights Reserved.
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
+ *
+ * In addition, when this program is distributed with Asterisk in
+ * any form that would qualify as a 'combined work' or as a
+ * 'derivative work' (but not mere aggregation), you can redistribute
+ * and/or modify the combination under the terms of the license
+ * provided with that copy of Asterisk, instead of the license
+ * terms granted here.
+ */
+
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -197,7 +228,7 @@
 int zap_open(int devnum, int *ismtp2)
 {
 	int fd;
-	DAHDI_BUFFERINFO bi;
+	struct dahdi_bufferinfo bi;
 	struct dahdi_params z;
 	fd = open("/dev/dahdi/channel", O_RDWR|O_NONBLOCK, 0600);
 	if ((fd < 0) || (ioctl(fd, DAHDI_SPECIFY, &devnum) == -1)) {

Modified: trunk/ss7test.c
URL: http://svn.digium.com/view/libss7/trunk/ss7test.c?view=diff&rev=201&r1=200&r2=201
==============================================================================
--- trunk/ss7test.c (original)
+++ trunk/ss7test.c Tue Aug  5 17:27:45 2008
@@ -1,3 +1,34 @@
+/*
+ * libss7: An implementation of Signalling System 7
+ *
+ * Written by Matthew Fredrickson <creslin at digium.com>
+ *
+ * scheduling routines taken from libpri by Mark Spencer <markster at digium.com>
+ *
+ * Copyright (C) 2006-2008, Digium, Inc
+ * All Rights Reserved.
+ */
+
+/*
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
+ *
+ * In addition, when this program is distributed with Asterisk in
+ * any form that would qualify as a 'combined work' or as a
+ * 'derivative work' (but not mere aggregation), you can redistribute
+ * and/or modify the combination under the terms of the license
+ * provided with that copy of Asterisk, instead of the license
+ * terms granted here.
+ */
+
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,9 +39,7 @@
 #include <pthread.h>
 #include <errno.h>
 #include <time.h>
-#ifdef LINUX
 #include <dahdi/user.h>
-#endif
 #include "libss7.h"
 
 struct linkset {
@@ -132,7 +161,7 @@
 int zap_open(int devnum)
 {
 	int fd;
-	DAHDI_BUFFERINFO bi;
+	struct dahdi_bufferinfo bi;
 	fd = open("/dev/dahdi/channel", O_RDWR|O_NONBLOCK, 0600);
 	if ((fd < 0) || (ioctl(fd, DAHDI_SPECIFY, &devnum) == -1)) {
 		printf("Could not open device %d: %s\n", strerror(errno));




More information about the svn-commits mailing list