svn commit: r337063 - branches/2014Q1/x11/3ddesktop/files

[Mathieu Arnold]

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 at 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);
          }
      }