From owner-cvs-all Mon Apr 8 21:24:45 2002 Delivered-To: cvs-all@freebsd.org Received: from rover.village.org (rover.bsdimp.com [204.144.255.66]) by hub.freebsd.org (Postfix) with ESMTP id 09E4F37B41A; Mon, 8 Apr 2002 21:24:36 -0700 (PDT) Received: from harmony.village.org (harmony.village.org [10.0.0.6]) by rover.village.org (8.11.3/8.11.3) with ESMTP id g394OWi94806; Mon, 8 Apr 2002 22:24:32 -0600 (MDT) (envelope-from imp@village.org) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.11.6/8.11.6) with ESMTP id g394OUc26686; Mon, 8 Apr 2002 22:24:30 -0600 (MDT) (envelope-from imp@village.org) Date: Mon, 08 Apr 2002 22:24:29 -0600 (MDT) Message-Id: <20020408.222429.22925353.imp@village.org> To: jhb@FreeBSD.org Cc: kris@obsecurity.org, obrien@FreeBSD.org, cvs-all@FreeBSD.org, cvs-committers@FreeBSD.org Subject: Re: cvs commit: src/sys/sys ioccom.h From: "M. Warner Losh" In-Reply-To: References: <20020408210151.B18407@xor.obsecurity.org> X-Mailer: Mew version 2.1 on Emacs 21.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG In message: John Baldwin writes: : No, I already said that I reverted the ()'s locally and it still failed to : compile. Yes, I was editing /usr/include/sys/ioccom.h and not : /sys/sys/ioccom.h. I also tried putting __P() back in, but it didn't build : then either. I'm wondering if the pollution in screen's osdef.h is new? Ah, the screen port. Lemme test this locally.... Hmmm, the new version of iocomm doesn't work either: osdef.h:81: conflicting types for `ioctl' /usr/include/sys/ioccom.h:75: previous declaration of `ioctl' The real problem is at osdef.h:81: extern int ioctl __P((int, int, char *)); Note the two problems with this: 1) int doesn't match unsgined long 2) char * doesn't match ... screen needs to be fixed. here's a real patch: --- osdef.h.in.orig Mon Apr 8 22:22:18 2002 +++ osdef.h.in Mon Apr 8 22:22:48 2002 @@ -111,7 +111,9 @@ extern int setpgid __P((int, int)); extern int tcsetpgrp __P((int, int)); #endif +#ifndef __FreeBSD__ extern int ioctl __P((int, int, char *)); +#endif extern int kill __P((int, int)); I put this as misc/screen/files/patch-aj and screen just built. Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message