com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqlnd/m ysqlnd_alloc.c ext/mysqlnd/mysqlnd_alloc.h
| From: | Johannes Schlüter | Date: | Thu, 21 Feb 2013 15:50:59 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqlnd/m ysqlnd_alloc.c ext/mysqlnd/mysqlnd_alloc.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71285@lists.php.net to get a copy of this message | ||
Commit: b479c2bffb91ee8a6c2e676920e895da08b68a4b
Author: Johannes Schlüter <johannes@schlueters.de> Thu, 21 Feb 2013 16:50:59 +0100
Parents: 7b719235b3547236a7297e566d5da90bab9674d8 064c62e4cf078cf08a40478dfe0e64bd51789e57
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b479c2bffb91ee8a6c2e676920e895da08b68a4b
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Changed paths:
MM ext/mysqlnd/mysqlnd_alloc.c
MM ext/mysqlnd/mysqlnd_alloc.h
Diff:
diff --cc ext/mysqlnd/mysqlnd_alloc.h
index c8f1bc4,33c0070..e6b0f08
--- 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
{