From owner-p4-projects@FreeBSD.ORG  Sat Apr 15 22:54:07 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2822A16A404; Sat, 15 Apr 2006 22:54:07 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 08A3616A402
	for <perforce@freebsd.org>; Sat, 15 Apr 2006 22:54:07 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C997A43D46
	for <perforce@freebsd.org>; Sat, 15 Apr 2006 22:54:06 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FMs6eh036841
	for <perforce@freebsd.org>; Sat, 15 Apr 2006 22:54:06 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FMs6NB036835
	for perforce@freebsd.org; Sat, 15 Apr 2006 22:54:06 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 15 Apr 2006 22:54:06 GMT
Message-Id: <200604152254.k3FMs6NB036835@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 95363 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: Sat, 15 Apr 2006 22:54:07 -0000

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

Change 95363 by jb@jb_freebsd2 on 2006/04/15 22:53:10

	Compatibility cruft.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/hash.c#2 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#2 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/hash.c#2 (text) ====

@@ -34,7 +34,11 @@
 #include <stdlib.h>
 #include <strings.h>
 #include <sys/types.h>
+#if defined(sun)
 #include <sys/sysmacros.h>
+#else
+#include <opensolaris/compat/sys/types.h>
+#endif
 
 #include "hash.h"
 #include "memory.h"

==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#2 (text) ====

@@ -27,7 +27,12 @@
 #pragma ident	"@(#)strtab.c	1.2	05/06/08 SMI"
 
 #include <sys/types.h>
+#if defined(sun)
 #include <sys/sysmacros.h>
+#else
+#include <opensolaris/compat/sys/types.h>
+#define	MIN(a, b)	((a) < (b) ? (a) : (b))
+#endif
 #include <strings.h>
 #include <stdlib.h>
 #include <stdio.h>