From owner-p4-projects@FreeBSD.ORG Sat Apr 29 23:23:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69E4A16A403; Sat, 29 Apr 2006 23:23:09 +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 4879E16A401 for ; Sat, 29 Apr 2006 23:23:09 +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 025EB43D46 for ; Sat, 29 Apr 2006 23:23:09 +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 k3TNN8tQ008010 for ; Sat, 29 Apr 2006 23:23:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3TNN8HM008004 for perforce@freebsd.org; Sat, 29 Apr 2006 23:23:08 GMT (envelope-from jb@freebsd.org) Date: Sat, 29 Apr 2006 23:23:08 GMT Message-Id: <200604292323.k3TNN8HM008004@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Apr 2006 23:23:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=96382 Change 96382 by jb@jb_freebsd2 on 2006/04/29 23:23:03 Remove compatibility includes that aren't required now that _SOLARIS_C_SOURCE can be defined to get those extra definitions out of the standard FreeBSD headers. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#5 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/input.c#3 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/findprime.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/head/gelf.h#6 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#4 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#7 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#8 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.h#3 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_strtab.h#3 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/hash.c#3 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#4 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#4 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#5 (text) ==== @@ -44,8 +44,6 @@ #include #if defined(sun) #include -#else -#include #endif #include #if defined(sun) ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/input.c#3 (text) ==== @@ -42,10 +42,6 @@ #include "decl.h" #include "msg.h" -#if !defined(sun) -#include -#endif - /* * File input * These functions read input files. ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/findprime.c#2 (text) ==== @@ -28,10 +28,6 @@ #include -#if !defined(sun) -#include -#endif - /* * function that will find a prime'ish number. Usefull for * hashbuckets and related things. ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#2 (text) ==== @@ -79,10 +79,6 @@ #include #include -#if !defined(sun) -#include -#endif - #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#2 (text) ==== @@ -26,10 +26,6 @@ #pragma ident "@(#)string_table.c 1.5 06/03/07 SMI" -#if !defined(sun) -#include -#endif - #include #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/head/gelf.h#6 (text) ==== @@ -37,7 +37,6 @@ #else #include #include -#include #include #include #endif ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#4 (text) ==== @@ -31,7 +31,6 @@ #include #if !defined(sun) #include -#include #endif #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#7 (text) ==== @@ -36,11 +36,11 @@ #include #include #include -#include #include #include #include #include +#include #endif #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#8 (text) ==== @@ -27,9 +27,6 @@ #pragma ident "@(#)dt_module.c 1.11 05/11/09 SMI" #include -#if !defined(sun) -#include -#endif #if defined(sun) #include #include @@ -41,7 +38,6 @@ #include #include #include -#include #endif #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.h#3 (text) ==== @@ -30,9 +30,6 @@ #pragma ident "@(#)dt_regset.h 1.2 05/06/08 SMI" #include -#if !defined(sun) -#include -#endif #ifdef __cplusplus extern "C" { ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_strtab.h#3 (text) ==== @@ -30,9 +30,6 @@ #pragma ident "@(#)dt_strtab.h 1.3 05/06/08 SMI" #include -#if !defined(sun) -#include -#endif #ifdef __cplusplus extern "C" { ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/hash.c#3 (text) ==== @@ -36,8 +36,6 @@ #include #if defined(sun) #include -#else -#include #endif #include "hash.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#4 (text) ==== @@ -30,7 +30,6 @@ #if defined(sun) #include #else -#include #define MIN(a, b) ((a) < (b) ? (a) : (b)) #endif #include ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#4 (text) ==== @@ -95,7 +95,6 @@ #include #if !defined(sun) #include -#include #else #include #endif