From owner-svn-src-stable-10@freebsd.org Sun Mar 20 20:33:29 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 595FEAD7D2D for ; Sun, 20 Mar 2016 20:33:29 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm44-vm7.bullet.mail.bf1.yahoo.com (nm44-vm7.bullet.mail.bf1.yahoo.com [216.109.115.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 10E892FF for ; Sun, 20 Mar 2016 20:33:28 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1458505623; bh=QYdKaipTzYJxlJyMsOgEVhKCL4RcMZQtEs2yN/WFNrI=; h=Subject:To:References:From:Date:In-Reply-To:From:Subject; b=oZ6Jp/CfULzOiWZfhyicd/JOIwW5xeelq9hfIYRZYn33inmHr3SGtm8JgINMpfbnDL5fz6cmbwK3ThyegMxn+dHAmymfORfUfJfdEtSZdRXoDhfWepACi54YGqkqub5RY0Ls9kQAIOI4kLKNQnhMfRf8vO1OAu76UVNMszoxOo5VqafG4mLIPrQE8szlZyJ5MByO33PWWOUM8up2Vatp+D+1bmYQP9vqw/gjXO8XN0vD1dlIQMfEZ+ZiofE469wrNzZ/64DSM6tqELsCEu+42Q7mG80ceBIamKh4wmxe1TJoiKDC3QYCwLmRSJoGuW817StNnEcoSdL7byHKiWTyEw== Received: from [66.196.81.170] by nm44.bullet.mail.bf1.yahoo.com with NNFMP; 20 Mar 2016 20:27:03 -0000 Received: from [68.142.230.74] by tm16.bullet.mail.bf1.yahoo.com with NNFMP; 20 Mar 2016 20:27:03 -0000 Received: from [127.0.0.1] by smtp231.mail.bf1.yahoo.com with NNFMP; 20 Mar 2016 20:27:03 -0000 X-Yahoo-Newman-Id: 586535.71307.bm@smtp231.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: zDtrwhQVM1lFw_EkLlLxjVATeEHZpl5UOgxQdf7LkchcuPV PdUN0Ty19H5RlyZdepGqqZJucDSI1I5BjH6KFKusoNEGa5t.6ZOyDq9Aw5YV NGuBWK4LvKUFAwTkZMcTTNGXz1LXsesjKOxms6EJZT108FNamzpyCz3kDvKM hj2TIdBdsagO0wamYmQNXtjYW2VnPhYeRbV50894Jivv_POcu7Z8o2h7cKIL 7hX35jeYYQUvFGXFJkHSWrJoR2gAj.QI7Z3vsLrVNwCNjpikBhJleoLDbsj4 HfYHOKJ8Wk1WrNpzP.1KOC_zv2RzcVV5T3HIL9fSs4Cq5mYGQX_MPnrNmwTn dIiCiq8nNa5mz9FiEBnsRyaKMbVpEyo8ZeDBPbfAGedIbdBnZmf2w4Yxhk1w V0GRRbEF.CQIOyC8sINbwXY7bMb4C.R1Njud9Ept2iURYxISIR3tVirQ2iix 1N0Bp1ykbtHyrrZGj14IyqfsZlG3tqEMqfPfygWGqSN4PfmOpKTEHQz8PYhK Q8PosJmPaxA5MWAv5cFjlfiBPPP.UG1m.GA-- X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Subject: Re: svn commit: r297077 - in stable/10: cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/lockstat cddl/contrib/opensolaris/cmd/mdb/tools/common cddl/contrib/opensolaris/cmd/plockstat cd... To: Alexander Motin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org References: <201603202000.u2KK0Q3L052581@repo.freebsd.org> From: Pedro Giffuni Message-ID: <56EF07DE.8060607@FreeBSD.org> Date: Sun, 20 Mar 2016 15:28:14 -0500 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.7.0 MIME-Version: 1.0 In-Reply-To: <201603202000.u2KK0Q3L052581@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Mar 2016 20:33:29 -0000 On 20/03/2016 15:00, Alexander Motin wrote: > Author: mav > Date: Sun Mar 20 20:00:25 2016 > New Revision: 297077 > URL: https://svnweb.freebsd.org/changeset/base/297077 > > Log: > MFC r277300 (by smh): Mechanically convert cddl sun #ifdef's to illumos > > Since the upstream for cddl code is now illumos not sun, mechanically > convert all sun #ifdef's to illumos #ifdef's which have been used in all > newer code for some time. > > Also do a manual pass to correct the use if #ifdef comments as per style(9) > as well as few uses of #if defined(__FreeBSD__) vs #ifndef illumos. > > Modified: > stable/10/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c > stable/10/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c > ... Nice, this reminds me ... We should probably also svn mv cddl/contrib/opensolaris cddl/contrib/illumos (new path is shorter) and svn rm ~/vendor/opensolaris (to avoid confusion) I find myself too lazy to figure out the build path updates though, and MFCs would become "interesting" ;). Pedro.