From owner-p4-projects@FreeBSD.ORG  Sat Jun 12 22:08:03 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BC28716A4D1; Sat, 12 Jun 2004 22:08:02 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9126516A4CE
	for <perforce@freebsd.org>; Sat, 12 Jun 2004 22:08:02 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7341A43D4C
	for <perforce@freebsd.org>; Sat, 12 Jun 2004 22:08:02 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5CM6mVP018276
	for <perforce@freebsd.org>; Sat, 12 Jun 2004 22:06:48 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5CM6mgR018273
	for perforce@freebsd.org; Sat, 12 Jun 2004 22:06:48 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 12 Jun 2004 22:06:48 GMT
Message-Id: <200406122206.i5CM6mgR018273@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 54751 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Jun 2004 22:08:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=54751

Change 54751 by rwatson@rwatson_tislabs on 2004/06/12 22:05:56

	Remove merge glitch.

Affected files ...

.. //depot/projects/netperf_socket/sys/sys/socketvar.h#12 edit

Differences ...

==== //depot/projects/netperf_socket/sys/sys/socketvar.h#12 (text+ko) ====

@@ -377,8 +377,6 @@
 		sowakeup_locked((so), &(so)->so_snd);			\
 } while (0)
 
-#ifdef _KERNEL
-
 /*
  * Argument structure for sosetopt et seq.  This is in the KERNEL
  * section because it will never be visible to user code.