andrey                                   Mon, 24 Oct 2011 12:54:04 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=318367

Log:
remove duplicate, happened after double patching

Changed paths:
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd_ext_plugin.h

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_ext_plugin.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_ext_plugin.h  2011-10-24 12:39:55 UTC 
(rev 318366)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_ext_plugin.h  2011-10-24 12:54:04 UTC 
(rev 318367)
@@ -64,69 +64,3 @@
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
-/*
-  +----------------------------------------------------------------------+
-  | PHP Version 5                                                        |
-  +----------------------------------------------------------------------+
-  | Copyright (c) 2006-2011 The PHP Group                                |
-  +----------------------------------------------------------------------+
-  | This source file is subject to version 3.01 of the PHP license,      |
-  | that is bundled with this package in the file LICENSE, and is        |
-  | available through the world-wide-web at the following url:           |
-  | http://www.php.net/license/3_01.txt                                  |
-  | If you did not receive a copy of the PHP license and are unable to   |
-  | obtain it through the world-wide-web, please send a note to          |
-  | lice...@php.net so we can mail you a copy immediately.               |
-  +----------------------------------------------------------------------+
-  | Authors: Andrey Hristov <and...@mysql.com>                           |
-  |          Ulf Wendel <uwen...@mysql.com>                              |
-  |          Georg Richter <ge...@mysql.com>                             |
-  +----------------------------------------------------------------------+
-*/
-/* $Id: mysqlnd.h 318221 2011-10-19 15:04:12Z andrey $ */
-
-#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 TSRMLS_DC);
-#define mysqlnd_plugin_get_plugin_connection_data(c, p_id) 
_mysqlnd_plugin_get_plugin_connection_data((c), (p_id) TSRMLS_CC)
-
-PHPAPI void ** _mysqlnd_plugin_get_plugin_result_data(const MYSQLND_RES * 
result, unsigned int plugin_id TSRMLS_DC);
-#define mysqlnd_plugin_get_plugin_result_data(r, p_id) 
_mysqlnd_plugin_get_plugin_result_data((r), (p_id) TSRMLS_CC)
-
-PHPAPI void ** _mysqlnd_plugin_get_plugin_stmt_data(const MYSQLND_STMT * stmt, 
unsigned int plugin_id TSRMLS_DC);
-#define mysqlnd_plugin_get_plugin_stmt_data(s, p_id) 
_mysqlnd_plugin_get_plugin_stmt_data((s), (p_id) TSRMLS_CC)
-
-PHPAPI void ** _mysqlnd_plugin_get_plugin_protocol_data(const MYSQLND_PROTOCOL 
* protocol, unsigned int plugin_id TSRMLS_DC);
-#define mysqlnd_plugin_get_plugin_protocol_data(p, p_id) 
_mysqlnd_plugin_get_plugin_protocol_data((p), (p_id) TSRMLS_CC)
-
-PHPAPI void ** _mysqlnd_plugin_get_plugin_net_data(const MYSQLND_NET * net, 
unsigned int plugin_id TSRMLS_DC);
-#define mysqlnd_plugin_get_plugin_net_data(n, p_id) 
_mysqlnd_plugin_get_plugin_net_data((n), (p_id) TSRMLS_CC)
-
-
-PHPAPI struct st_mysqlnd_conn_methods * mysqlnd_conn_get_methods();
-PHPAPI void mysqlnd_conn_set_methods(struct st_mysqlnd_conn_methods * methods);
-
-PHPAPI struct st_mysqlnd_res_methods * mysqlnd_result_get_methods();
-PHPAPI void mysqlnd_result_set_methods(struct st_mysqlnd_res_methods * 
methods);
-
-PHPAPI struct st_mysqlnd_stmt_methods * mysqlnd_stmt_get_methods();
-PHPAPI void mysqlnd_stmt_set_methods(struct st_mysqlnd_stmt_methods * methods);
-
-PHPAPI struct st_mysqlnd_protocol_methods * mysqlnd_protocol_get_methods();
-PHPAPI void mysqlnd_protocol_set_methods(struct st_mysqlnd_protocol_methods * 
methods);
-
-PHPAPI struct st_mysqlnd_net_methods * mysqlnd_net_get_methods();
-PHPAPI void mysqlnd_net_set_methods(struct st_mysqlnd_net_methods * methods);
-
-
-#endif /* MYSQLND_EXT_PLUGIN_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim<600: noet sw=4 ts=4
- */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to