diff options
| author | Xinchen Hui <laruence@php.net> | 2014-05-20 15:50:41 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-05-20 15:50:41 +0800 |
| commit | f2028491aa44367dbf77cc1008e9e4b027f60666 (patch) | |
| tree | 8377e27cb7145df823751ead056f8857f140f870 /ext/mysqlnd/mysqlnd_debug.h | |
| parent | e1317ed5176d9c467d885c3149fa668822172cb1 (diff) | |
| parent | 4d299b5092ac18e158073ac92ad606fd4858b05c (diff) | |
| download | php-git-f2028491aa44367dbf77cc1008e9e4b027f60666.tar.gz | |
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
Conflicts:
ext/pdo_pgsql/tests/common.phpt
Diffstat (limited to 'ext/mysqlnd/mysqlnd_debug.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_debug.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h index 861851378b..6f073b1489 100644 --- a/ext/mysqlnd/mysqlnd_debug.h +++ b/ext/mysqlnd/mysqlnd_debug.h @@ -66,7 +66,6 @@ struct st_mysqlnd_plugin_trace_log struct { MYSQLND_DEBUG * (*trace_instance_init)(const char * skip_functions[] TSRMLS_DC); - char * (*get_backtrace)(uint max_levels, size_t * length TSRMLS_DC); } methods; }; @@ -74,7 +73,6 @@ void mysqlnd_debug_trace_plugin_register(TSRMLS_D); PHPAPI MYSQLND_DEBUG * mysqlnd_debug_init(const char * skip_functions[] TSRMLS_DC); -PHPAPI char * mysqlnd_get_backtrace(uint max_levels, size_t * length TSRMLS_DC); #if defined(__GNUC__) || (defined(_MSC_VER) && (_MSC_VER >= 1400)) #ifdef PHP_WIN32 |