From owner-freebsd-current Mon May 10 15:30:40 1999 Delivered-To: freebsd-current@freebsd.org Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.54]) by hub.freebsd.org (Postfix) with ESMTP id C641B150BA for ; Mon, 10 May 1999 15:30:32 -0700 (PDT) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.9.3/8.9.1) id PAA76264 for freebsd-current@freebsd.org; Mon, 10 May 1999 15:26:51 -0700 (PDT) (envelope-from sgk) From: Steve Kargl Message-Id: <199905102226.PAA76264@troutmask.apl.washington.edu> Subject: major/minor cleanup breakage To: freebsd-current@freebsd.org Date: Mon, 10 May 1999 15:26:51 -0700 (PDT) X-Mailer: ELM [version 2.4ME+ PL54 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Peter, Poul, cvsup from cvsup2 at 1215 pst 10 may 99. make buildworld yields (wrapped to <80 char lines) ===> usr.sbin/i4b/isdnmonitor cc -O2 -pipe -DDEBUG -I/usr/obj/usr/src/tmp/usr/include -c \ /usr/src/usr.sbin/i4b/isdnmonitor/main.c gzip -cn /usr/src/usr.sbin/i4b/isdnmonitor/isdnmonitor.8 > isdnmonitor.8.gz /usr/src/usr.sbin/i4b/isdnmonitor/main.c:103: `major' redeclared as different\ kind of symbol /usr/obj/usr/src/tmp/usr/include/sys/types.h:114: previous declaration of \ `major' /usr/src/usr.sbin/i4b/isdnmonitor/main.c:104: `minor' redeclared as different \ kind of symbol /usr/obj/usr/src/tmp/usr/include/sys/types.h:108: previous declaration of \ `minor' {standard input}: Assembler messages: {standard input}:1519: Fatal error: Symbol minor already defined. *** Error code 1 1 error This patch might fix the problem. -- Steve --- main.c.orig Mon May 10 15:24:29 1999 +++ main.c Mon May 10 15:25:20 1999 @@ -100,8 +100,8 @@ static int sub_state = 0; static int sub_state_count = 0; -static int major = 0; -static int minor = 0; +static int isdn_major = 0; +static int isdn_minor = 0; static int nctrl = 0; static u_int32_t rights = 0; @@ -450,13 +450,13 @@ { case 0: /* initial data */ - major = I4B_GET_2B(msg, I4B_MON_IDATA_VERSMAJOR); - minor = I4B_GET_2B(msg, I4B_MON_IDATA_VERSMINOR); + isdn_major = I4B_GET_2B(msg, I4B_MON_IDATA_VERSMAJOR); + isdn_minor = I4B_GET_2B(msg, I4B_MON_IDATA_VERSMINOR); nctrl = I4B_GET_2B(msg, I4B_MON_IDATA_NUMCTRL); rights = I4B_GET_4B(msg, I4B_MON_IDATA_CLACCESS); printf("remote protocol version is %02d.%02d, %d controller(s) found, our rights = %x\n", - major, minor, nctrl, rights); + isdn_major, isdn_minor, nctrl, rights); if (nctrl > 0) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message