From 8286ce087d0f3fccebc003a197c0a03c6298613c Mon Sep 17 00:00:00 2001
From: "Meredith L. Patterson" <mlp@thesmartpolitenerd.com>
Date: Wed, 18 Dec 2013 14:55:26 +0100
Subject: [PATCH] hpt_to_php needs TSRMLS_FETCH too; update swig to version
perl uses
---
.travis.yml | 2 +-
src/bindings/php/hammer.i | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index d9092257..7801ab4f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,7 +56,7 @@ matrix:
env: BINDINGS=php CC=clang
before_install:
- sudo apt-get update -qq
- - if [ "$BINDINGS" != "none" ]; then sudo add-apt-repository ppa:dns/irc -y; sudo apt-get update -qq; sudo apt-get install -qq swig=2.0.8-1irc1~12.04; swig -version; fi
+ - if [ "$BINDINGS" != "none" ]; then sudo add-apt-repository ppa:dns/irc -y; sudo apt-get update -qq; sudo apt-get install -qq swig=2.0.8-1irc1~12.04; fi
- if [ "$BINDINGS" == "python" ]; then sudo apt-get install -qq python-dev; fi
install: true
diff --git a/src/bindings/php/hammer.i b/src/bindings/php/hammer.i
index 58bfbad4..3835c283 100644
--- a/src/bindings/php/hammer.i
+++ b/src/bindings/php/hammer.i
@@ -121,6 +121,7 @@
%inline {
void hpt_to_php(const HParsedToken *token, zval *return_value) {
+ TSRMLS_FETCH();
if (!token) {
RETVAL_NULL();
return;
--
GitLab