com php-src: MDNR: - cleanup after PHP7 changes (removal of TSRMLS_**): ext/mysqlnd/mysqlnd_ext_plugin.h
| From: | Andrey Hristov | Date: | Thu, 12 Nov 2015 15:19:16 +0000 |
| Subject: | com php-src: MDNR: - cleanup after PHP7 changes (removal of TSRMLS_**): ext/mysqlnd/mysqlnd_ext_plugin.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89826@lists.php.net to get a copy of this message | ||
Commit: 3f7a7837cd55f5e66a29cc9d3bbf8368db06bdd7
Author: Andrey Hristov <andrey@php.net> Mon, 12 Oct 2015 15:05:33 +0200
Parents: cfd868651a321fbfd84ed98e33669c5f94a7098a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3f7a7837cd55f5e66a29cc9d3bbf8368db06bdd7
Log:
MDNR:
- cleanup after PHP7 changes (removal of TSRMLS_**)
Changed paths:
M ext/mysqlnd/mysqlnd_ext_plugin.h
Diff:
diff --git a/ext/mysqlnd/mysqlnd_ext_plugin.h b/ext/mysqlnd/mysqlnd_ext_plugin.h
index 3a106f7..b140daa 100644
--- a/ext/mysqlnd/mysqlnd_ext_plugin.h
+++ b/ext/mysqlnd/mysqlnd_ext_plugin.h
@@ -22,32 +22,15 @@
#ifndef MYSQLND_EXT_PLUGIN_H
#define MYSQLND_EXT_PLUGIN_H
-PHPAPI void ** _mysqlnd_plugin_get_plugin_connection_data(const MYSQLND * conn, unsigned int
plugin_id);
-#define mysqlnd_plugin_get_plugin_connection_data(c, p_id)
_mysqlnd_plugin_get_plugin_connection_data((c), (p_id))
-
-PHPAPI void ** _mysqlnd_plugin_get_plugin_connection_data_data(const MYSQLND_CONN_DATA * conn,
unsigned int plugin_id);
-#define mysqlnd_plugin_get_plugin_connection_data_data(c, p_id)
_mysqlnd_plugin_get_plugin_connection_data_data((c), (p_id))
-
-PHPAPI void ** _mysqlnd_plugin_get_plugin_result_data(const MYSQLND_RES * result, unsigned int
plugin_id);
-#define mysqlnd_plugin_get_plugin_result_data(r, p_id) _mysqlnd_plugin_get_plugin_result_data((r),
(p_id))
-
-PHPAPI void ** _mysqlnd_plugin_get_plugin_result_unbuffered_data(const MYSQLND_RES_UNBUFFERED *
result, unsigned int plugin_id);
-#define mysqlnd_plugin_get_plugin_result_unbuffered_data(r, p_id)
_mysqlnd_plugin_get_plugin_result_unbuffered_data((r), (p_id))
-
-PHPAPI void ** _mysqlnd_plugin_get_plugin_result_buffered_data_zval(const MYSQLND_RES_BUFFERED_ZVAL
* result, unsigned int plugin_id);
-#define mysqlnd_plugin_get_plugin_result_buffered_data_zval(r, p_id)
_mysqlnd_plugin_get_plugin_result_buffered_data_zval((r), (p_id))
-
-PHPAPI void ** _mysqlnd_plugin_get_plugin_result_buffered_data_c(const MYSQLND_RES_BUFFERED_C *
result, unsigned int plugin_id);
-#define mysqlnd_plugin_get_plugin_result_buffered_data_c(r, p_id)
_mysqlnd_plugin_get_plugin_result_buffered_data_c((r), (p_id))
-
-PHPAPI void ** _mysqlnd_plugin_get_plugin_stmt_data(const MYSQLND_STMT * stmt, unsigned int
plugin_id);
-#define mysqlnd_plugin_get_plugin_stmt_data(s, p_id) _mysqlnd_plugin_get_plugin_stmt_data((s),
(p_id))
-
-PHPAPI void ** _mysqlnd_plugin_get_plugin_protocol_data(const
MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * factory, unsigned int plugin_id);
-#define mysqlnd_plugin_get_plugin_protocol_data(p, p_id)
_mysqlnd_plugin_get_plugin_protocol_data((p), (p_id))
-
-PHPAPI void ** _mysqlnd_plugin_get_plugin_net_data(const MYSQLND_NET * net, unsigned int
plugin_id);
-#define mysqlnd_plugin_get_plugin_net_data(n, p_id) _mysqlnd_plugin_get_plugin_net_data((n),
(p_id))
+PHPAPI void ** mysqlnd_plugin_get_plugin_connection_data(const MYSQLND * conn, unsigned int
plugin_id);
+PHPAPI void ** mysqlnd_plugin_get_plugin_connection_data_data(const MYSQLND_CONN_DATA * conn,
unsigned int plugin_id);
+PHPAPI void ** mysqlnd_plugin_get_plugin_result_data(const MYSQLND_RES * result, unsigned int
plugin_id);
+PHPAPI void ** mysqlnd_plugin_get_plugin_result_unbuffered_data(const MYSQLND_RES_UNBUFFERED *
result, unsigned int plugin_id);
+PHPAPI void ** mysqlnd_plugin_get_plugin_result_buffered_data_zval(const MYSQLND_RES_BUFFERED_ZVAL
* result, unsigned int plugin_id);
+PHPAPI void ** mysqlnd_plugin_get_plugin_result_buffered_data_c(const MYSQLND_RES_BUFFERED_C *
result, unsigned int plugin_id);
+PHPAPI void ** mysqlnd_plugin_get_plugin_stmt_data(const MYSQLND_STMT * stmt, unsigned int
plugin_id);
+PHPAPI void ** mysqlnd_plugin_get_plugin_protocol_data(const
MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * factory, unsigned int plugin_id);
+PHPAPI void ** mysqlnd_plugin_get_plugin_net_data(const MYSQLND_NET * net, unsigned int plugin_id);
PHPAPI struct st_mysqlnd_object_factory_methods * mysqlnd_object_factory_get_methods();