From da1dd2ffd217c4be8822ce372605b3f71af3378f Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Thu, 1 Dec 2016 15:09:36 +1300 Subject: [PATCH] [PHP] Pick a default dtor which can't collide --- Source/Modules/php.cxx | 2 +- Source/Modules/php5.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index 6c949c9f9..213025d95 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -165,7 +165,7 @@ static void SwigPHP_emit_resource_registrations() { } if (!rsrc_dtor_name) { - rsrc_dtor_name = NewString("_wrap_default_rsrc_destroy"); + rsrc_dtor_name = NewString("_swig_default_rsrc_destroy"); if (!emitted_default_dtor) { // Write out custom destructor function Printf(s_wrappers, "static ZEND_RSRC_DTOR_FUNC(%s) {\n", rsrc_dtor_name); diff --git a/Source/Modules/php5.cxx b/Source/Modules/php5.cxx index 610be6e07..3b7fdc1b0 100644 --- a/Source/Modules/php5.cxx +++ b/Source/Modules/php5.cxx @@ -165,7 +165,7 @@ static void SwigPHP_emit_resource_registrations() { } if (!rsrc_dtor_name) { - rsrc_dtor_name = NewString("_wrap_default_rsrc_destroy"); + rsrc_dtor_name = NewString("_swig_default_rsrc_destroy"); if (!emitted_default_dtor) { // Write out custom destructor function Printf(s_wrappers, "static ZEND_RSRC_DTOR_FUNC(%s) {\n", rsrc_dtor_name);