From owner-svn-src-head@FreeBSD.ORG  Thu Jun 25 13:36:58 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4F31E106564A;
	Thu, 25 Jun 2009 13:36:58 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3D7708FC1A;
	Thu, 25 Jun 2009 13:36:58 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5PDawU0052803;
	Thu, 25 Jun 2009 13:36:58 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5PDawU8052801;
	Thu, 25 Jun 2009 13:36:58 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200906251336.n5PDawU8052801@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 25 Jun 2009 13:36:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194959 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Jun 2009 13:36:58 -0000

Author: jhb
Date: Thu Jun 25 13:36:57 2009
New Revision: 194959
URL: http://svn.freebsd.org/changeset/base/194959

Log:
  Tweak the oshmctl() compile fix: convert the K&R definition to ANSI.

Modified:
  head/sys/kern/sysv_shm.c

Modified: head/sys/kern/sysv_shm.c
==============================================================================
--- head/sys/kern/sysv_shm.c	Thu Jun 25 13:15:20 2009	(r194958)
+++ head/sys/kern/sysv_shm.c	Thu Jun 25 13:36:57 2009	(r194959)
@@ -116,10 +116,6 @@ struct shmmap_state {
 	int shmid;
 };
 
-#if defined(__i386__) && (defined(COMPAT_FREEBSD4) || defined(COMPAT_43))
-struct oshmctl_args;
-static int oshmctl(struct thread *td, struct oshmctl_args *uap);
-#endif
 static void shm_deallocate_segment(struct shmid_kernel *);
 static int shm_find_segment_by_key(key_t);
 static struct shmid_kernel *shm_find_segment_by_shmid(int);
@@ -901,9 +897,7 @@ struct oshmctl_args {
 };
 
 static int
-oshmctl(td, uap)
-	struct thread *td;
-	struct oshmctl_args *uap;
+oshmctl(struct thread *td, struct oshmctl_args *uap)
 {
 #ifdef COMPAT_43
 	int error = 0;