Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Feb 2017 11:32:51 +0000 (UTC)
From:      Jimmy Olgeni <olgeni@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r433002 - in head/lang/erlang-runtime16: . files
Message-ID:  <201702011132.v11BWpwL041601@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: olgeni
Date: Wed Feb  1 11:32:51 2017
New Revision: 433002
URL: https://svnweb.freebsd.org/changeset/ports/433002

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

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

Modified: head/lang/erlang-runtime16/Makefile
==============================================================================
--- head/lang/erlang-runtime16/Makefile	Wed Feb  1 11:31:45 2017	(r433001)
+++ head/lang/erlang-runtime16/Makefile	Wed Feb  1 11:32:51 2017	(r433002)
@@ -3,7 +3,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	16.b.03.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\

Added: head/lang/erlang-runtime16/files/patch-lib_wx_c__src_wxe__impl.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/erlang-runtime16/files/patch-lib_wx_c__src_wxe__impl.cpp	Wed Feb  1 11:32:51 2017	(r433002)
@@ -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()) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702011132.v11BWpwL041601>