diff options
| author | Johannes Schlüter <johannes@schlueters.de> | 2013-02-21 16:49:28 +0100 |
|---|---|---|
| committer | Johannes Schlüter <johannes@schlueters.de> | 2013-02-21 16:49:28 +0100 |
| commit | 064c62e4cf078cf08a40478dfe0e64bd51789e57 (patch) | |
| tree | e34f5562dcc330af9430d4cc35108707738562a1 | |
| parent | 1e9bc5677505585173ac105c997a09c095f34d1d (diff) | |
| download | php-git-064c62e4cf078cf08a40478dfe0e64bd51789e57.tar.gz | |
Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs)
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_alloc.c | 2 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_alloc.h | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -19,6 +19,10 @@ PHP NEWS . Fixed bug #61930 (openssl corrupts ssl key resource when using openssl_get_publickey()). (Stas) +- PDO_mysql: + . Fixed bug #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs). + (Johannes) + - SPL: . Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS). (patch by kriss@krizalys.com, Laruence) diff --git a/ext/mysqlnd/mysqlnd_alloc.c b/ext/mysqlnd/mysqlnd_alloc.c index 380a0fbaa0..39c1711b02 100644 --- a/ext/mysqlnd/mysqlnd_alloc.c +++ b/ext/mysqlnd/mysqlnd_alloc.c @@ -42,7 +42,7 @@ static const char mysqlnd_free_name[] = "_mysqlnd_free"; static const char mysqlnd_pestrndup_name[] = "_mysqlnd_pestrndup"; static const char mysqlnd_pestrdup_name[] = "_mysqlnd_pestrdup"; -const char * mysqlnd_debug_std_no_trace_funcs[] = +PHPAPI const char * mysqlnd_debug_std_no_trace_funcs[] = { mysqlnd_emalloc_name, mysqlnd_ecalloc_name, diff --git a/ext/mysqlnd/mysqlnd_alloc.h b/ext/mysqlnd/mysqlnd_alloc.h index 6bd4385e61..33c007026a 100644 --- a/ext/mysqlnd/mysqlnd_alloc.h +++ b/ext/mysqlnd/mysqlnd_alloc.h @@ -24,7 +24,7 @@ #ifndef MYSQLND_ALLOC_H #define MYSQLND_ALLOC_H -extern const char * mysqlnd_debug_std_no_trace_funcs[]; +PHPAPI extern const char * mysqlnd_debug_std_no_trace_funcs[]; #define MYSQLND_MEM_D TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC #define MYSQLND_MEM_C TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC |