From: Fabien Potencier Date: Wed, 23 Nov 2011 11:11:28 +0000 (+0100) Subject: merged branch derickr/master (PR #526) X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=84c4ba1aca5adc2967e10823ed1e5abe3f03a4f9;p=web%2Fkonrad%2Ftwig.git merged branch derickr/master (PR #526) Commits ------- c4a7d19 Merge branch 'master' of github.com:derickr/twig-ext 7d37d66 Make the extension ZTS-proof. 9879ca2 Merge branch 'master' of github.com:derickr/twig-ext 40ec671 Fixed name in license. Discussion ---------- Added ZTS (windows TS) support Hi! Seemed that since last time I tested, I forgot to sprinkle in some TSRMLS calls all over the place for ZTS support. This pull request pulls that in, as well as my previous name-in-license change. Derick --------------------------------------------------------------------------- by fabpot at 2011/11/21 03:19:09 -0800 @derickr: Now that the extension is in the Twig repo, can you work there directly so that we can avoid the merge commits? --------------------------------------------------------------------------- by derickr at 2011/11/21 03:22:54 -0800 On Mon, 21 Nov 2011, Fabien Potencier wrote: > @derickr: Now that the extension is in the Twig repo, can you work there directly so that we can avoid the merge commits? Will do that form now on. Derick --------------------------------------------------------------------------- by stealth35 at 2011/11/21 04:42:14 -0800 @derickr could you add the `config.w32`, and fix the `php_twig.h` ? --------------------------------------------------------------------------- by stealth35 at 2011/11/21 07:03:53 -0800 You also need to fix `php_twig.h`, like : ``` c ZEND_BEGIN_MODULE_GLOBALS(twig) long global_value; ZEND_END_MODULE_GLOBALS(twig) ``` and move `zval *tmp_self_cache;` ([@L828][1]) in the top of the function (after `zval *ret = NULL;` ([@L708][2]) for example) Now build seem to be OK, all tests pass under Windows I have a complied version if some people are interest to testing : https://github.com/downloads/stealth35/stealth35.github.com/php_twig-5.3-vc9-x86.zip [1]: https://github.com/derickr/Twig/blob/c4a7d1983dab7e2818cca3c4896704f4fce7becc/ext/twig/twig.c#L828 [2]: https://github.com/derickr/Twig/blob/c4a7d1983dab7e2818cca3c4896704f4fce7becc/ext/twig/twig.c#L708 --------------------------------------------------------------------------- by stealth35 at 2011/11/21 07:06:42 -0800 @fabpot any plan for the version number ? actually it's v0.0.1, sould it be the same as Twig ? --- 84c4ba1aca5adc2967e10823ed1e5abe3f03a4f9