diff options
| author | Olly Betts <olly@survex.com> | 2013-01-08 18:33:47 +1300 |
|---|---|---|
| committer | Olly Betts <olly@survex.com> | 2013-01-08 18:33:47 +1300 |
| commit | 0dd11cdd8daa120f24f196f5dc6b02507f3292ee (patch) | |
| tree | f289b9e535bfa1031b135d22688e267d78a1f2fc | |
| parent | 553b04edeb2a78a3de2ef4725ac82c59810475ec (diff) | |
| download | swig-0dd11cdd8daa120f24f196f5dc6b02507f3292ee.tar.gz | |
Fix to work with a ZTS build of PHP (broken in 2.0.7)
| -rw-r--r-- | CHANGES.current | 3 | ||||
| -rw-r--r-- | Source/Modules/php.cxx | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGES.current b/CHANGES.current index 0b1d7ccc7..05d533c17 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. 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 Fix bashism in configure, introduced in 2.0.9. diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index 5c3ce283e..9b68d072c 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -418,6 +418,7 @@ public: Append(s_header, "static void SWIG_FAIL() __attribute__ ((__noreturn__));\n"); Append(s_header, "#endif\n\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"); // 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 |