From owner-svn-ports-all@FreeBSD.ORG  Fri Dec 20 18:27:14 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 25ECBA4D;
 Fri, 20 Dec 2013 18:27:14 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 11CA71DB6;
 Fri, 20 Dec 2013 18:27:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKIRD1o078273;
 Fri, 20 Dec 2013 18:27:13 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKIRDX0078271;
 Fri, 20 Dec 2013 18:27:13 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201312201827.rBKIRDX0078271@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Fri, 20 Dec 2013 18:27:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r337063 - branches/2014Q1/x11/3ddesktop/files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Dec 2013 18:27:14 -0000

Author: mat
Date: Fri Dec 20 18:27:13 2013
New Revision: 337063
URL: http://svnweb.freebsd.org/changeset/ports/337063

Log:
  MFH: r337055
  
  Fix build with clang
  
  PR:		ports/184871
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
  Approved by:	portmgr (implicit)

Added:
  branches/2014Q1/x11/3ddesktop/files/patch-config.cpp
     - copied unchanged from r337055, head/x11/3ddesktop/files/patch-config.cpp
Modified:
  branches/2014Q1/x11/3ddesktop/files/patch-event.hpp   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Copied: branches/2014Q1/x11/3ddesktop/files/patch-config.cpp (from r337055, head/x11/3ddesktop/files/patch-config.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/x11/3ddesktop/files/patch-config.cpp	Fri Dec 20 18:27:13 2013	(r337063, copy of r337055, head/x11/3ddesktop/files/patch-config.cpp)
@@ -0,0 +1,13 @@
+--- config.cpp.orig
++++ config.cpp
+@@ -64,8 +64,9 @@
+ }
+ 
+ 
+-Options::Options(char *n = NULL) 
++Options::Options(char *n) 
+ {
++    n = NULL;
+ 
+     if (n)
+         strncpy(name, n, sizeof(name));

Modified: branches/2014Q1/x11/3ddesktop/files/patch-event.hpp
==============================================================================
--- branches/2014Q1/x11/3ddesktop/files/patch-event.hpp	Fri Dec 20 18:24:48 2013	(r337062)
+++ branches/2014Q1/x11/3ddesktop/files/patch-event.hpp	Fri Dec 20 18:27:13 2013	(r337063)
@@ -5,7 +5,7 @@
          for (k = events.begin(); k != events.end(); ++k) {
              Event *e = *k;
 -            printf(":: Event %d  0x%x\n", e->type, (unsigned int)(e->function));
-+            printf(":: Event %d  0x%x\n", e->type, (unsigned intptr_t)(e->function));
++            printf(":: Event %d  %p\n", e->type, e->function);
          }
      }