[packages/hhvm/hhvm-3.2] more missing MAX and MAXPATHLEN macro nonsense
glen
glen at pld-linux.org
Sun Oct 19 00:58:16 CEST 2014
commit ff3ab26684485e1adc12c328ab0d0dcb4fc197d0
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Oct 19 01:57:40 2014 +0300
more missing MAX and MAXPATHLEN macro nonsense
hhvm-build.patch | 17 +++++++++++++++--
hhvm.spec | 2 +-
2 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/hhvm.spec b/hhvm.spec
index 57314da..e05a4fa 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -10,7 +10,7 @@
Summary: Virtual Machine, Runtime, and JIT for PHP
Name: hhvm
Version: 3.2.0
-Release: 3
+Release: 4
License: PHP 3.01
Group: Development/Languages
Source0: https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz
diff --git a/hhvm-build.patch b/hhvm-build.patch
index ed218a4..de69f00 100644
--- a/hhvm-build.patch
+++ b/hhvm-build.patch
@@ -23,8 +23,21 @@
if (sym != StackSym::W && sym != StackSym::K && sym != StackSym::L &&
sym != StackSym::T && sym != StackSym::I && sym != StackSym::H) {
m_actualStack.push_back(m_symStack.size());
---- hhvm-HHVM-3.2.0/hphp/runtime/ext/ext_misc.cpp~ 2014-07-18 02:12:10.000000000 +0200
-+++ hhvm-HHVM-3.2.0/hphp/runtime/ext/ext_misc.cpp 2014-10-18 21:47:56.381988051 +0200
+--- hhvm-HHVM-3.2.0/hphp/runtime/base/zend-pack.cpp~ 2014-07-18 03:12:10.000000000 +0300
++++ hhvm-HHVM-3.2.0/hphp/runtime/base/zend-pack.cpp 2014-10-16 10:55:01.949440443 +0300
+@@ -21,6 +21,10 @@
+ #include "hphp/runtime/base/type-conversions.h"
+ #include "hphp/runtime/base/builtin-functions.h"
+
++#ifndef MAX
++#define MAX(a, b) ((a)>(b)?(a):(b))
++#endif
++
+ namespace HPHP {
+
+ #define INC_OUTPUTPOS(a,b) \
+--- hhvm-HHVM-3.2.0/hphp/runtime/ext/ext_misc.cpp~ 2014-07-18 03:12:10.000000000 +0300
++++ hhvm-HHVM-3.2.0/hphp/runtime/ext/ext_misc.cpp 2014-10-17 23:32:19.855207368 +0300
@@ -17,6 +17,7 @@
#include "hphp/runtime/ext/ext_misc.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/ff3ab26684485e1adc12c328ab0d0dcb4fc197d0
More information about the pld-cvs-commit
mailing list