From owner-svn-src-head@FreeBSD.ORG  Tue Apr 14 04:52:54 2015
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:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 328EC4C0;
 Tue, 14 Apr 2015 04:52:54 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1DDF9F70;
 Tue, 14 Apr 2015 04:52:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3E4qrbs040035;
 Tue, 14 Apr 2015 04:52:53 GMT (envelope-from eadler@FreeBSD.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3E4qrae040029;
 Tue, 14 Apr 2015 04:52:53 GMT (envelope-from eadler@FreeBSD.org)
Message-Id: <201504140452.t3E4qrae040029@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: eadler set sender to
 eadler@FreeBSD.org using -f
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 14 Apr 2015 04:52:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281517 - head/usr.bin/ipcs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
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/options/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: Tue, 14 Apr 2015 04:52:54 -0000

Author: eadler
Date: Tue Apr 14 04:52:52 2015
New Revision: 281517
URL: https://svnweb.freebsd.org/changeset/base/281517

Log:
  ipcs: fix builds that use gcc
  	gcc gets annoyed by duplicate declarations
  
  Reported by:	sbruno
  Reviewed by:	sbruno

Modified:
  head/usr.bin/ipcs/ipc.c
  head/usr.bin/ipcs/ipc.h

Modified: head/usr.bin/ipcs/ipc.c
==============================================================================
--- head/usr.bin/ipcs/ipc.c	Tue Apr 14 02:38:57 2015	(r281516)
+++ head/usr.bin/ipcs/ipc.c	Tue Apr 14 04:52:52 2015	(r281517)
@@ -55,7 +55,6 @@ struct msginfo		msginfo;
 struct msqid_kernel	*msqids;
 struct shminfo		shminfo;
 struct shmid_kernel	*shmsegs;
-void	kget(int idx, void *addr, size_t size);
 
 struct nlist symbols[] = {
 	{ .n_name = "sema" },

Modified: head/usr.bin/ipcs/ipc.h
==============================================================================
--- head/usr.bin/ipcs/ipc.h	Tue Apr 14 02:38:57 2015	(r281516)
+++ head/usr.bin/ipcs/ipc.h	Tue Apr 14 04:52:52 2015	(r281517)
@@ -64,8 +64,5 @@ extern struct nlist symbols[];
 extern kvm_t *kd;
 
 extern struct semid_kernel	*sema;
-extern struct seminfo		seminfo;
-extern struct msginfo		msginfo;
 extern struct msqid_kernel	*msqids;
-extern struct shminfo		shminfo;
 extern struct shmid_kernel	*shmsegs;