diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2011-02-04 20:25:59 +0000 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2011-02-04 20:25:59 +0000 |
| commit | 74883f1dd7b22fdca609787300460f5550aec095 (patch) | |
| tree | 65e30a2d7d2a536a07ada422bb561a304a24becf | |
| parent | 7fe18eaacbdc70b1c1ce53d3421cbd28441fdeef (diff) | |
| download | swig-74883f1dd7b22fdca609787300460f5550aec095.tar.gz | |
[PHP] SF #3166423 Recent PHP versions no longer define zend_error_noreturn - calls to this have been replaced with zend_error.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12430 626c5289-ae23-0410-ae9c-e8d60b6d4f22
| -rw-r--r-- | CHANGES.current | 4 | ||||
| -rw-r--r-- | Source/Modules/php.cxx | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/CHANGES.current b/CHANGES.current index 14e662774..11e9ff71e 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -6,6 +6,10 @@ Version 2.0.2 (in progress) =========================== 2011-02-04: wsfulton + [PHP] SF #3166423 Recent PHP versions no longer define zend_error_noreturn - calls to this + have been replaced with zend_error. + +2011-02-04: wsfulton [clisp] SF #3148200 Fix segfault parsing nested unions. 2011-02-01: wsfulton diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index 43eee9ae6..554e40bb8 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -976,7 +976,7 @@ public: /* Error handling code */ Printf(f->code, "fail:\n"); Printv(f->code, cleanup, NIL); - Printv(f->code, "zend_error_noreturn(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());", NIL); + Printv(f->code, "zend_error(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());", NIL); Printf(f->code, "}\n"); @@ -2290,7 +2290,7 @@ done: Append(f->code, "return;\n"); Append(f->code, "fail:\n"); - Append(f->code, "zend_error_noreturn(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());\n"); + Append(f->code, "zend_error(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());\n"); Printf(f->code, "}\n"); Wrapper_print(f, s_wrappers); @@ -2665,7 +2665,7 @@ done: } Append(w->code, "fail:\n"); - Append(w->code, "zend_error_noreturn(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());\n"); + Append(w->code, "zend_error(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());\n"); Append(w->code, "}\n"); // We expose protected methods via an extra public inline method which makes a straight call to the wrapped class' method |