svn commit: r433003 - in head/lang/erlang-runtime17: . files

Jimmy Olgeni olgeni at FreeBSD.org
Wed Feb 1 11:33:07 UTC 2017


Author: olgeni
Date: Wed Feb  1 11:33:05 2017
New Revision: 433003
URL: https://svnweb.freebsd.org/changeset/ports/433003

Log:
  lang/erlang-runtime17: fix build with clang 4.0.
  
  PR:		216615
  Submitted by:	Jan Beich

Added:
  head/lang/erlang-runtime17/files/patch-lib_wx_c__src_wxe__impl.cpp   (contents, props changed)
Modified:
  head/lang/erlang-runtime17/Makefile

Modified: head/lang/erlang-runtime17/Makefile
==============================================================================
--- head/lang/erlang-runtime17/Makefile	Wed Feb  1 11:32:51 2017	(r433002)
+++ head/lang/erlang-runtime17/Makefile	Wed Feb  1 11:33:05 2017	(r433003)
@@ -3,7 +3,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	17.5.6.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\

Added: head/lang/erlang-runtime17/files/patch-lib_wx_c__src_wxe__impl.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/erlang-runtime17/files/patch-lib_wx_c__src_wxe__impl.cpp	Wed Feb  1 11:33:05 2017	(r433003)
@@ -0,0 +1,20 @@
+--- lib/wx/c_src/wxe_impl.cpp.orig	2017-01-30 23:13:25 UTC
++++ lib/wx/c_src/wxe_impl.cpp
+@@ -666,7 +666,7 @@ void * WxeApp::getPtr(char * bp, wxeMemE
+     throw wxe_badarg(index);
+   }
+   void * temp = memenv->ref2ptr[index];
+-  if((index < memenv->next) && ((index == 0) || (temp > NULL)))
++  if((index < memenv->next) && ((index == 0) || (temp != NULL)))
+     return temp;
+   else {
+     throw wxe_badarg(index);
+@@ -678,7 +678,7 @@ void WxeApp::registerPid(char * bp, ErlD
+   if(!memenv)
+     throw wxe_badarg(index);
+   void * temp = memenv->ref2ptr[index];
+-  if((index < memenv->next) && ((index == 0) || (temp > NULL))) {
++  if((index < memenv->next) && ((index == 0) || (temp != NULL))) {
+     ptrMap::iterator it;
+     it = ptr2ref.find(temp);
+     if(it != ptr2ref.end()) {


More information about the svn-ports-all mailing list