From: Christopher Jones Date: Sat, 2 May 2015 17:03:30 +0000 (-0700) Subject: Add unique prefix to exported function X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~109 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ba353ef6983a93841de6673320d7d78982007f6;p=php Add unique prefix to exported function --- diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index 8c33b7f0e1..3387da0f2d 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -2298,7 +2298,7 @@ void pdo_stmt_init(void) pdo_row_ce->serialize = pdo_row_serialize; } -PDO_API void free_statement(pdo_stmt_t *stmt) +PDO_API void php_pdo_free_statement(pdo_stmt_t *stmt) { if (stmt->bound_params) { zend_hash_destroy(stmt->bound_params); @@ -2353,7 +2353,7 @@ PDO_API void free_statement(pdo_stmt_t *stmt) void pdo_dbstmt_free_storage(zend_object *std) { pdo_stmt_t *stmt = php_pdo_stmt_fetch_object(std); - free_statement(stmt); + php_pdo_free_statement(stmt); } zend_object *pdo_dbstmt_new(zend_class_entry *ce) diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h index 2181ba94f8..407d1baa82 100644 --- a/ext/pdo/php_pdo_driver.h +++ b/ext/pdo/php_pdo_driver.h @@ -687,7 +687,7 @@ PDO_API void pdo_raise_impl_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, PDO_API void php_pdo_dbh_addref(pdo_dbh_t *dbh); PDO_API void php_pdo_dbh_delref(pdo_dbh_t *dbh); -PDO_API void free_statement(pdo_stmt_t *stmt); +PDO_API void php_pdo_free_statement(pdo_stmt_t *stmt); #endif /* PHP_PDO_DRIVER_H */ diff --git a/ext/pdo_oci/oci_statement.c b/ext/pdo_oci/oci_statement.c index b2f8abc311..e47fba513b 100644 --- a/ext/pdo_oci/oci_statement.c +++ b/ext/pdo_oci/oci_statement.c @@ -652,7 +652,7 @@ static int oci_blob_close(php_stream *stream, int close_handle) efree(self); } - free_statement(stmt); + php_pdo_free_statement(stmt); return 0; }