Date: Wed, 17 Jun 1998 13:26:06 +0200 From: Gary Jennejohn <garyj@peedub.muc.de> To: Michael Bielicki <Michael.Bielicki@linkdesign.com> Cc: freebsd-isdn@FreeBSD.ORG Subject: Re: =?us-ascii?Q?Can=B4t?= compile CURRENT Kernel with i4b-0.62 Message-ID: <199806171126.NAA03572@peedub.muc.de> In-Reply-To: Your message of "Mon, 15 Jun 1998 13:51:59 %2B0200." <XFMail.980615135159.Michael.Bielicki@Linkdesign.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Michael Bielicki writes:
>Hi Folks,
>I get the following error when compiling a kernel with i4b on CURRENT as of
>today
>
>root@cyprus(5)# make
>cc -c -O -m486 -pipe -Wreturn-type -Wcomment -Wredundant-decls -Wimplicit
>-Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
>-Winline -Wuninitialized -ansi -nostdinc -I- -I. -I../.. -I../../../include
>-DKERNEL -include opt_global.h ../../i4b/driver/i4b_trace.c
>../../i4b/driver/i4b_trace.c:414: conflicting types for `i4btrcioctl'
>../../i4b/driver/i4b_trace.c:124: previous declaration of `i4btrcioctl'
>*** Error code 1
>
>Stop.
>root@cyprus(6)#
>
>Got any ideas ?
>
maybe you've already fixed this, but here are some patches I sent to
Hellmuth -
======================================
*** driver/i4b_ctl.c.orig Sun Jun 14 12:44:11 1998
--- driver/i4b_ctl.c Sun Jun 14 12:42:58 1998
***************
*** 190,196 ****
--- 190,200 ----
* i4bctlioctl - device driver ioctl routine
*---------------------------------------------------------------------------*/
PDEVSTATIC int
+ #if defined (__FreeBSD_version) && __FreeBSD_version >= 300003
+ i4bctlioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+ #else
i4bctlioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+ #endif
{
ctl_debug_t *cdbg;
int error = 0;
*** driver/i4b_trace.c.orig Sun Jun 14 12:40:06 1998
--- driver/i4b_trace.c Sun Jun 14 12:41:13 1998
***************
*** 410,416 ****
--- 410,420 ----
* device driver ioctl routine
*---------------------------------------------------------------------------*/
PDEVSTATIC int
+ #if defined (__FreeBSD_version) && __FreeBSD_version >= 300003
+ i4btrcioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+ #else
i4btrcioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+ #endif
{
int error = 0;
int unit = minor(dev);
*** layer4/i4b_i4bdrv.c.orig Sun Jun 14 12:44:32 1998
--- layer4/i4b_i4bdrv.c Sun Jun 14 12:46:15 1998
***************
*** 63,68 ****
--- 63,69 ----
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
#include <sys/ioccom.h>
#include <sys/malloc.h>
+ #include <sys/uio.h>
#else
#include <sys/ioctl.h>
#endif
***************
*** 248,254 ****
--- 249,259 ----
* i4bioctl - device driver ioctl routine
*---------------------------------------------------------------------------*/
PDEVSTATIC int
+ #if defined (__FreeBSD_version) && __FreeBSD_version >= 300003
+ i4bioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+ #else
i4bioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+ #endif
{
call_desc_t *cd;
int error = 0;
---
Gary Jennejohn
Home - garyj@muc.de
Work - garyj@fkr.dec.com
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-isdn" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199806171126.NAA03572>