From owner-p4-projects@FreeBSD.ORG  Wed Jun  4 03:17:02 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3803D106572F; Wed,  4 Jun 2008 03:17:02 +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 C2792106566B
	for <perforce@freebsd.org>; Wed,  4 Jun 2008 03:17:01 +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 ABADB8FC26
	for <perforce@freebsd.org>; Wed,  4 Jun 2008 03:17:01 +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 m543H1Yk079887
	for <perforce@freebsd.org>; Wed, 4 Jun 2008 03:17:01 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m543H1hh079885
	for perforce@freebsd.org; Wed, 4 Jun 2008 03:17:01 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 4 Jun 2008 03:17:01 GMT
Message-Id: <200806040317.m543H1hh079885@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 142863 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: Wed, 04 Jun 2008 03:17:02 -0000

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

Change 142863 by jb@freebsd3 on 2008/06/04 03:16:54

	More OpenSolaris compatibility cleansing updates.

Affected files ...

.. //depot/projects/dtrace6/src/include/elf.h#3 edit
.. //depot/projects/dtrace6/src/include/stdlib.h#3 edit
.. //depot/projects/dtrace6/src/include/strings.h#3 edit
.. //depot/projects/dtrace6/src/include/unistd.h#3 edit

Differences ...

==== //depot/projects/dtrace6/src/include/elf.h#3 (text+ko) ====

@@ -38,8 +38,4 @@
 #include <sys/elf32.h>
 #include <sys/elf64.h>
 
-#ifdef _SOLARIS_C_SOURCE
-#include <sys/_elf_solaris.h>
-#endif
-
 #endif /* !_ELF_H_ */

==== //depot/projects/dtrace6/src/include/stdlib.h#3 (text+ko) ====

@@ -282,9 +282,6 @@
 extern char *suboptarg;			/* getsubopt(3) external variable */
 #endif /* __BSD_VISIBLE */
 
-#ifdef _SOLARIS_C_SOURCE
-#define	getexecname	getprogname
-#endif
 __END_DECLS
 
 #endif /* !_STDLIB_H_ */

==== //depot/projects/dtrace6/src/include/strings.h#3 (text+ko) ====

@@ -53,8 +53,4 @@
 int	 strncasecmp(const char *, const char *, size_t) __pure;
 __END_DECLS
 
-#ifdef _SOLARIS_C_SOURCE
-#include <string.h>
-#endif
-
 #endif /* _STRINGS_H_ */

==== //depot/projects/dtrace6/src/include/unistd.h#3 (text+ko) ====

@@ -296,8 +296,6 @@
 
 /* Extensions found in Solaris and Linux. */
 #define	_SC_PHYS_PAGES		121
-#define	_SC_NPROCESSORS_MAX	122
-#define	_SC_CPUID_MAX		123
 
 /* Keys for the confstr(3) function. */
 #if __POSIX_VISIBLE >= 199209