jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix to work with a ZTS build of PHP (broken in 2.0.7)

Browse source
This commit is contained in:
Olly Betts 2013-01-08 18:33:47 +13:00
commit 0dd11cdd8d
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.current
View file

@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 2.0.10 (in progress) Version 2.0.10 (in progress)
============================ ============================
2013-01-08: olly
[PHP] Fix to work with a ZTS build of PHP (broken in 2.0.7).
2013-01-07: olly 2013-01-07: olly
Fix bashism in configure, introduced in 2.0.9. Fix bashism in configure, introduced in 2.0.9.

1
Source/Modules/php.cxx
View file

@ -418,6 +418,7 @@ public:
Append(s_header, "static void SWIG_FAIL() __attribute__ ((__noreturn__));\n"); Append(s_header, "static void SWIG_FAIL() __attribute__ ((__noreturn__));\n");
Append(s_header, "#endif\n\n"); Append(s_header, "#endif\n\n");
Append(s_header, "static void SWIG_FAIL() {\n"); Append(s_header, "static void SWIG_FAIL() {\n");
Append(s_header, " TSRMLS_FETCH();\n");
Append(s_header, " zend_error(SWIG_ErrorCode(), \"%s\", SWIG_ErrorMsg());\n"); Append(s_header, " zend_error(SWIG_ErrorCode(), \"%s\", SWIG_ErrorMsg());\n");
// zend_error() should never return with the parameters we pass, but if it // zend_error() should never return with the parameters we pass, but if it
// does, we really don't want to let SWIG_FAIL() return. This also avoids // does, we really don't want to let SWIG_FAIL() return. This also avoids