From owner-freebsd-current@FreeBSD.ORG Thu Feb 1 12:29:57 2007 Return-Path: X-Original-To: Current@freebsd.org Delivered-To: freebsd-current@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7943316A405 for ; Thu, 1 Feb 2007 12:29:57 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from out4.smtp.messagingengine.com (out4.smtp.messagingengine.com [66.111.4.28]) by mx1.freebsd.org (Postfix) with ESMTP id 4F62413C478 for ; Thu, 1 Feb 2007 12:29:57 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from out1.internal (unknown [10.202.2.149]) by out1.messagingengine.com (Postfix) with ESMTP id 873809E238 for ; Thu, 1 Feb 2007 07:08:06 -0500 (EST) Received: from heartbeat1.messagingengine.com ([10.202.2.160]) by out1.internal (MEProxy); Thu, 01 Feb 2007 07:08:06 -0500 X-Sasl-enc: lCkDMJxCkcjnMOkMUzPqlzkTaULuk64KLmaVXH3++lJf 1170331686 Received: from [192.168.123.18] (82-35-112-254.cable.ubr07.dals.blueyonder.co.uk [82.35.112.254]) by mail.messagingengine.com (Postfix) with ESMTP id 222782443A for ; Thu, 1 Feb 2007 07:08:05 -0500 (EST) Message-ID: <45C1D824.3090604@incunabulum.net> Date: Thu, 01 Feb 2007 12:08:04 +0000 From: Bruce M Simpson User-Agent: Thunderbird 1.5.0.9 (X11/20070125) MIME-Version: 1.0 To: FreeBSD current mailing list Content-Type: multipart/mixed; boundary="------------010809070603090408070202" Cc: Subject: breaks C++ in kernel Click X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Feb 2007 12:29:57 -0000 This is a multi-part message in MIME format. --------------010809070603090408070202 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, A C++ reserved keyword crept in, which is breaking the Click kernel module build. This patch gets rid of the argument names from the prototypes, which also fixes style bugs. Could I have an ok from someone for this? Cheers, BMS --------------010809070603090408070202 Content-Type: text/x-patch; name="lock.h.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="lock.h.diff" Index: lock.h =================================================================== RCS file: /home/ncvs/src/sys/sys/lock.h,v retrieving revision 1.62 diff -u -p -r1.62 lock.h --- lock.h 13 Nov 2006 05:43:42 -0000 1.62 +++ lock.h 1 Feb 2007 12:05:57 -0000 @@ -217,9 +217,9 @@ extern struct lock_class lock_class_lock extern struct lock_class *lock_classes[]; -void lock_init(struct lock_object *lock, struct lock_class *class, - const char *name, const char *type, int flags); -void lock_destroy(struct lock_object *lock); +void lock_init(struct lock_object *, struct lock_class *, + const char *, const char *, int); +void lock_destroy(struct lock_object *); void spinlock_enter(void); void spinlock_exit(void); void witness_init(struct lock_object *); --------------010809070603090408070202--