From owner-svn-src-head@freebsd.org  Sat Nov 26 12:36:13 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 156D6C5574E;
 Sat, 26 Nov 2016 12:36:13 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D8F9FC61;
 Sat, 26 Nov 2016 12:36:12 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAQCaCYM097611;
 Sat, 26 Nov 2016 12:36:12 GMT (envelope-from rakuco@FreeBSD.org)
Received: (from rakuco@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAQCaCd7097610;
 Sat, 26 Nov 2016 12:36:12 GMT (envelope-from rakuco@FreeBSD.org)
Message-Id: <201611261236.uAQCaCd7097610@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rakuco set sender to
 rakuco@FreeBSD.org using -f
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sat, 26 Nov 2016 12:36:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r309191 - head/usr.bin/dtc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Nov 2016 12:36:13 -0000

Author: rakuco (ports committer)
Date: Sat Nov 26 12:36:11 2016
New Revision: 309191
URL: https://svnweb.freebsd.org/changeset/base/309191

Log:
  fdt: Expect strchr() to return a const char*
  
  In C, strchr(3) returns a char*, whereas C++ defines two overloads:
  * const char *strchr(const char*, int)
  * char *strchr(char*, int)
  
  Building fdt.cc (with the WITHOUT_GPL_DTC knob set) with libc++ 3.9.0 (imported
  in r309124) was failing because libc++ r260377 added the first overload to
  string.h, leading to failures such as:
  
      fdt.cc:1638:8: error: cannot initialize a variable of type 'char *' with an
      rvalue of type 'const char *'
  
  Just define val as a const char* to fix it.
  
  Upstreamed in https://github.com/davidchisnall/dtc/pull/14
  
  Reviewed by:	emaste
  Approved by:	emaste

Modified:
  head/usr.bin/dtc/fdt.cc

Modified: head/usr.bin/dtc/fdt.cc
==============================================================================
--- head/usr.bin/dtc/fdt.cc	Sat Nov 26 10:36:48 2016	(r309190)
+++ head/usr.bin/dtc/fdt.cc	Sat Nov 26 12:36:11 2016	(r309191)
@@ -1635,7 +1635,7 @@ device_tree::parse_dts(const string &fn,
 
 bool device_tree::parse_define(const char *def)
 {
-	char *val = strchr(def, '=');
+	const char *val = strchr(def, '=');
 	if (!val)
 	{
 		if (strlen(def) != 0)