From owner-p4-projects@FreeBSD.ORG  Sun Oct 28 23:14:16 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7534E16A41A; Sun, 28 Oct 2007 23:14:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 26B4616A418
	for <perforce@freebsd.org>; Sun, 28 Oct 2007 23:14:16 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1759113C465
	for <perforce@freebsd.org>; Sun, 28 Oct 2007 23:14:16 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9SNEF1R063065
	for <perforce@freebsd.org>; Sun, 28 Oct 2007 23:14:15 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9SNEF4G063062
	for perforce@freebsd.org; Sun, 28 Oct 2007 23:14:15 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 28 Oct 2007 23:14:15 GMT
Message-Id: <200710282314.l9SNEF4G063062@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 128259 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sun, 28 Oct 2007 23:14:16 -0000

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

Change 128259 by jb@jb_freebsd1 on 2007/10/28 23:14:13

	Remove definitions which clash with those in a Solaris header
	of the same name.

Affected files ...

.. //depot/projects/dtrace/src/sys/compat/opensolaris/rpc/xdr.h#2 edit

Differences ...

==== //depot/projects/dtrace/src/sys/compat/opensolaris/rpc/xdr.h#2 (text+ko) ====

@@ -50,19 +50,6 @@
 #define xdr_control(a,b,c) xdrmem_control(a,b,c)
 
 /*
- * These are XDR control operators
- */
-
-#define	XDR_GET_BYTES_AVAIL 1
-
-struct xdr_bytesrec {
-	bool_t xc_is_last_record;
-	size_t xc_num_avail;
-};
-
-typedef struct xdr_bytesrec xdr_bytesrec;
-
-/*
  * These are the request arguments to XDR_CONTROL.
  *
  * XDR_PEEK - returns the contents of the next XDR unit on the XDR stream.