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

[PHP4] Add missing ZTS annotations to generated C++ wrapper code

Browse source 
to fix compilation failures when using ZTS enabled SWIG (Linux
distributions tend to disable ZTS, but notably the Windows build
uses it by default).


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9669 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2007-04-03 15:56:36 +00:00
commit a5ac23e6d2
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES.current
View file

@ -1,6 +1,12 @@
Version 1.3.32 (in progress) Version 1.3.32 (in progress)
============================ ============================
04/03/2007: olly
[PHP4] Add missing ZTS annotations to generated C++ wrapper code
to fix compilation failures when using ZTS enabled SWIG (Linux
distributions tend to disable ZTS, but notably the Windows build
uses it by default).
04/01/2007: efuzzyone 04/01/2007: efuzzyone
[CFFI] Patch #1684261: fixes handling of unsigned int literals, thanks Leigh Smith. [CFFI] Patch #1684261: fixes handling of unsigned int literals, thanks Leigh Smith.
Also, improved documentation. Also, improved documentation.

4
Source/Modules/php4.cxx
View file

@ -2304,11 +2304,11 @@ public:
if (base.item) { if (base.item) {
Printf(s_oinit, Printf(s_oinit,
"if (! (ptr_ce_swig_%s=zend_register_internal_class_ex(&ce_swig_%s,&ce_swig_%s,NULL))) zend_error(E_ERROR,\"Error registering wrapper for class %s\");\n", "if (! (ptr_ce_swig_%s=zend_register_internal_class_ex(&ce_swig_%s,&ce_swig_%s,NULL TSRMLS_CC))) zend_error(E_ERROR,\"Error registering wrapper for class %s\");\n",
shadow_classname, shadow_classname, GetChar(base.item, "sym:name"), shadow_classname); shadow_classname, shadow_classname, GetChar(base.item, "sym:name"), shadow_classname);
} else { } else {
Printf(s_oinit, Printf(s_oinit,
"if (! (ptr_ce_swig_%s=zend_register_internal_class_ex(&ce_swig_%s,NULL,NULL))) zend_error(E_ERROR,\"Error registering wrapper for class %s\");\n", "if (! (ptr_ce_swig_%s=zend_register_internal_class_ex(&ce_swig_%s,NULL,NULL TSRMLS_CC))) zend_error(E_ERROR,\"Error registering wrapper for class %s\");\n",
shadow_classname, shadow_classname, shadow_classname); shadow_classname, shadow_classname, shadow_classname);
} }
Printf(s_oinit, "\n"); Printf(s_oinit, "\n");