From: Johannes Schlüter <johannes@schlueters.de>
Date: Thu, 21 Feb 2013 15:50:59 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha6~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b479c2bffb91ee8a6c2e676920e895da08b68a4b;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

b479c2bffb91ee8a6c2e676920e895da08b68a4b
diff --cc ext/mysqlnd/mysqlnd_alloc.h
index c8f1bc4cf1,33c007026a..e6b0f08815
--- a/ext/mysqlnd/mysqlnd_alloc.h
+++ b/ext/mysqlnd/mysqlnd_alloc.h
@@@ -24,10 -24,10 +24,10 @@@
  #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
 +#define MYSQLND_MEM_D	TSRMLS_DC ZEND_FILE_LINE_ORIG_DC
 +#define MYSQLND_MEM_C	TSRMLS_CC ZEND_FILE_LINE_CC
  
  struct st_mysqlnd_allocator_methods
  {