Skip to content

Commit bef54e5

Browse files
committed
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Fixed mysqlnd compilation in debug mode on windows
2 parents d5c2da5 + 0d458ae commit bef54e5

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

ext/mysqlnd/mysqlnd_driver.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ static void
9999
mysqlnd_error_list_pdtor(void * pDest)
100100
{
101101
MYSQLND_ERROR_LIST_ELEMENT * element = (MYSQLND_ERROR_LIST_ELEMENT *) pDest;
102+
#ifdef ZTS
102103
TSRMLS_FETCH();
104+
#endif
103105
DBG_ENTER("mysqlnd_error_list_pdtor");
104106
if (element->error) {
105107
mnd_pefree(element->error, TRUE);

0 commit comments

Comments
 (0)