From owner-freebsd-bugs  Mon May 10 18:20: 4 1999
Delivered-To: freebsd-bugs@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 7317B15C7C
	for <freebsd-bugs@FreeBSD.org>; Mon, 10 May 1999 18:20:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id SAA03710;
	Mon, 10 May 1999 18:20:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from tt.uninet.ee (tt.uninet.ee [194.204.0.239])
	by hub.freebsd.org (Postfix) with ESMTP id 38ED41577C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 10 May 1999 18:15:20 -0700 (PDT)
	(envelope-from taavi@tt.uninet.ee)
Received: (from taavi@localhost)
	by tt.uninet.ee (8.9.3/8.8.8) id EAA99296;
	Tue, 11 May 1999 04:15:19 +0300 (EEST)
	(envelope-from taavi)
Message-Id: <199905110115.EAA99296@tt.uninet.ee>
Date: Tue, 11 May 1999 04:15:19 +0300 (EEST)
From: Taavi Talvik <taavi@tt.uninet.ee>
Reply-To: taavi@tt.uninet.ee
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: bin/11631: /usr/src/usr.sbin/i4b/isdnmonitor/main.c
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         11631
>Category:       bin
>Synopsis:       /usr/src/usr.sbin/i4b/isdnmonitor/main.c
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 10 18:20:00 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     Taavi Talvik
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
Uninet
>Environment:

make buildworld broken cur current cvsupped Tue May 11 01:11:02 GMT 1999
broken in /usr/src/usr.sbin/i4b/isdnmonitor/main.c

>Description:

major and minor conflict with defines in sys/types.h

>How-To-Repeat:

	make buildworld

>Fix:

103,104c103,104
< static int major = 0;
< static int minor = 0;
---
> static int i4b_major = 0;
> static int i4b_minor = 0;
453,454c453,454
< 			major = I4B_GET_2B(msg, I4B_MON_IDATA_VERSMAJOR);
< 			minor = I4B_GET_2B(msg, I4B_MON_IDATA_VERSMINOR);
---
> 			i4b_major = I4B_GET_2B(msg, I4B_MON_IDATA_VERSMAJOR);
> 			i4b_minor = I4B_GET_2B(msg, I4B_MON_IDATA_VERSMINOR);
459c459
< 				major, minor, nctrl, rights);
---
> 				i4b_major, i4b_minor, nctrl, rights);

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message