diff options
| author | Johannes Schlüter <johannes@schlueters.de> | 2013-02-21 16:50:59 +0100 |
|---|---|---|
| committer | Johannes Schlüter <johannes@schlueters.de> | 2013-02-21 16:50:59 +0100 |
| commit | b479c2bffb91ee8a6c2e676920e895da08b68a4b (patch) | |
| tree | 7399865aaa67a213d65ef29dd0634ab70cef8619 | |
| parent | 7b719235b3547236a7297e566d5da90bab9674d8 (diff) | |
| parent | 064c62e4cf078cf08a40478dfe0e64bd51789e57 (diff) | |
| download | php-git-b479c2bffb91ee8a6c2e676920e895da08b68a4b.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
| -rw-r--r-- | ext/mysqlnd/mysqlnd_alloc.c | 2 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_alloc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_alloc.c b/ext/mysqlnd/mysqlnd_alloc.c index 325444cdc4..80e8156016 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 c8f1bc4cf1..e6b0f08815 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_ORIG_DC #define MYSQLND_MEM_C TSRMLS_CC ZEND_FILE_LINE_CC |