Merge branch 'PHP-5.4' into PHP-5.5

johannes · johannes · commit b479c2bffb91 · 2013-02-21T16:50:59.000+01:00
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ static const char mysqlnd_free_name[] = "_mysqlnd_free";`
`42`	`42`	`static const char mysqlnd_pestrndup_name[] = "_mysqlnd_pestrndup";`
`43`	`43`	`static const char mysqlnd_pestrdup_name[] = "_mysqlnd_pestrdup";`
`44`	`44`
`45`		`-const char * mysqlnd_debug_std_no_trace_funcs[] =`
	`45`	`+PHPAPI const char * mysqlnd_debug_std_no_trace_funcs[] =`
`46`	`46`	`{`
`47`	`47`	`mysqlnd_emalloc_name,`
`48`	`48`	`mysqlnd_ecalloc_name,`