[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysqlnd/mysqlnd.c branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c trunk/ext/mysqlnd/mysqlnd.c trunk/ext/mysqlnd/mysqlnd_ps.c

2011-09-17 Thread Pierre Joye 
pajoye   Sat, 17 Sep 2011 10:24:18 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=316906

Log:
- fix TS build

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c
U   php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c

Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c  2011-09-17 10:01:16 UTC 
(rev 316905)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c  2011-09-17 10:24:18 UTC 
(rev 316906)
@@ -74,9 +74,9 @@
 static void
 mysqlnd_error_list_pdtor(void * pDest)
 {
+   TSRMLS_FETCH();
MYSQLND_ERROR_LIST_ELEMENT * element = (MYSQLND_ERROR_LIST_ELEMENT *) 
pDest;
DBG_ENTER(mysqlnd_error_list_pdtor);
-   TSRMLS_FETCH();
if (element-error) {
mnd_pefree(element-error, TRUE);
}

Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c
===
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c   2011-09-17 
10:01:16 UTC (rev 316905)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c   2011-09-17 
10:24:18 UTC (rev 316906)
@@ -58,8 +58,8 @@
 mysqlnd_ps_error_list_pdtor(void * pDest)
 {
MYSQLND_ERROR_LIST_ELEMENT * element = (MYSQLND_ERROR_LIST_ELEMENT *) 
pDest;
+   TSRMLS_FETCH();
DBG_ENTER(mysqlnd_ps_error_list_pdtor);
-   TSRMLS_FETCH();
if (element-error) {
mnd_pefree(element-error, TRUE);
}

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-09-17 10:01:16 UTC (rev 
316905)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-09-17 10:24:18 UTC (rev 
316906)
@@ -74,9 +74,9 @@
 static void
 mysqlnd_error_list_pdtor(void * pDest)
 {
+   TSRMLS_FETCH();
MYSQLND_ERROR_LIST_ELEMENT * element = (MYSQLND_ERROR_LIST_ELEMENT *) 
pDest;
DBG_ENTER(mysqlnd_error_list_pdtor);
-   TSRMLS_FETCH();
if (element-error) {
mnd_pefree(element-error, TRUE);
}

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c  2011-09-17 10:01:16 UTC (rev 
316905)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c  2011-09-17 10:24:18 UTC (rev 
316906)
@@ -58,8 +58,8 @@
 mysqlnd_ps_error_list_pdtor(void * pDest)
 {
MYSQLND_ERROR_LIST_ELEMENT * element = (MYSQLND_ERROR_LIST_ELEMENT *) 
pDest;
+   TSRMLS_FETCH();
DBG_ENTER(mysqlnd_ps_error_list_pdtor);
-   TSRMLS_FETCH();
if (element-error) {
mnd_pefree(element-error, TRUE);
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysqlnd/mysqlnd.c branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c trunk/ext/mysqlnd/mysqlnd.c trunk/ext/mysqlnd/mysqlnd_ps.c

2011-09-16 Thread Dmitry Stogov 
dmitry   Fri, 16 Sep 2011 06:55:43 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=316846

Log:
Fixed Windows build

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c
U   php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c

Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c  2011-09-16 06:15:42 UTC 
(rev 316845)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c  2011-09-16 06:55:43 UTC 
(rev 316846)
@@ -75,8 +75,8 @@
 mysqlnd_error_list_pdtor(void * pDest)
 {
MYSQLND_ERROR_LIST_ELEMENT * element = (MYSQLND_ERROR_LIST_ELEMENT *) 
pDest;
+   DBG_ENTER(mysqlnd_error_list_pdtor);
TSRMLS_FETCH();
-   DBG_ENTER(mysqlnd_error_list_pdtor);
if (element-error) {
mnd_pefree(element-error, TRUE);
}

Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c
===
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c   2011-09-16 
06:15:42 UTC (rev 316845)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c   2011-09-16 
06:55:43 UTC (rev 316846)
@@ -58,8 +58,8 @@
 mysqlnd_ps_error_list_pdtor(void * pDest)
 {
MYSQLND_ERROR_LIST_ELEMENT * element = (MYSQLND_ERROR_LIST_ELEMENT *) 
pDest;
+   DBG_ENTER(mysqlnd_ps_error_list_pdtor);
TSRMLS_FETCH();
-   DBG_ENTER(mysqlnd_ps_error_list_pdtor);
if (element-error) {
mnd_pefree(element-error, TRUE);
}

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-09-16 06:15:42 UTC (rev 
316845)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-09-16 06:55:43 UTC (rev 
316846)
@@ -75,8 +75,8 @@
 mysqlnd_error_list_pdtor(void * pDest)
 {
MYSQLND_ERROR_LIST_ELEMENT * element = (MYSQLND_ERROR_LIST_ELEMENT *) 
pDest;
+   DBG_ENTER(mysqlnd_error_list_pdtor);
TSRMLS_FETCH();
-   DBG_ENTER(mysqlnd_error_list_pdtor);
if (element-error) {
mnd_pefree(element-error, TRUE);
}

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c  2011-09-16 06:15:42 UTC (rev 
316845)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c  2011-09-16 06:55:43 UTC (rev 
316846)
@@ -58,8 +58,8 @@
 mysqlnd_ps_error_list_pdtor(void * pDest)
 {
MYSQLND_ERROR_LIST_ELEMENT * element = (MYSQLND_ERROR_LIST_ELEMENT *) 
pDest;
+   DBG_ENTER(mysqlnd_ps_error_list_pdtor);
TSRMLS_FETCH();
-   DBG_ENTER(mysqlnd_ps_error_list_pdtor);
if (element-error) {
mnd_pefree(element-error, TRUE);
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysqlnd/mysqlnd.c branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c trunk/ext/mysqlnd/mysqlnd.c trunk/ext/mysqlnd/mysqlnd_ps.c

2011-09-16 Thread Pierrick Charron 
Hi Dmitry,

This patch is causing problem on my linux box

/pierrick/php-src/branches/PHP_5_4/TSRM
-I/home/pierrick/php-src/branches/PHP_5_4/Zend -D_REENTRANT
-I/usr/include -g -fvisibility=hidden -pthread -O0 -Wall -DZTS
-DZEND_SIGNALS -c
/home/pierrick/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c  -fPIC
-DPIC -o ext/mysqlnd/.libs/mysqlnd.o
/home/pierrick/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c: In
function ‘mysqlnd_error_list_pdtor’:
/home/pierrick/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c:78:2:
error: ‘tsrm_ls’ undeclared (first use in this function)
/home/pierrick/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c:78:2:
note: each undeclared identifier is reported only once for each
function it appears in
make: *** [ext/mysqlnd/mysqlnd.lo] Error

Thanks
Pierrick

On 16 September 2011 02:55, Dmitry Stogov dmi...@php.net wrote:
 dmitry                                   Fri, 16 Sep 2011 06:55:43 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=316846

 Log:
 Fixed Windows build

 Changed paths:
    U   php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c
    U   php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd.c
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c

 Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c
 ===
 --- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c  2011-09-16 06:15:42 
 UTC (rev 316845)
 +++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c  2011-09-16 06:55:43 
 UTC (rev 316846)
 @@ -75,8 +75,8 @@
  mysqlnd_error_list_pdtor(void * pDest)
  {
        MYSQLND_ERROR_LIST_ELEMENT * element = (MYSQLND_ERROR_LIST_ELEMENT *) 
 pDest;
 +       DBG_ENTER(mysqlnd_error_list_pdtor);
        TSRMLS_FETCH();
 -       DBG_ENTER(mysqlnd_error_list_pdtor);
        if (element-error) {
                mnd_pefree(element-error, TRUE);
        }

 Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c
 ===
 --- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c       2011-09-16 
 06:15:42 UTC (rev 316845)
 +++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_ps.c       2011-09-16 
 06:55:43 UTC (rev 316846)
 @@ -58,8 +58,8 @@
  mysqlnd_ps_error_list_pdtor(void * pDest)
  {
        MYSQLND_ERROR_LIST_ELEMENT * element = (MYSQLND_ERROR_LIST_ELEMENT *) 
 pDest;
 +       DBG_ENTER(mysqlnd_ps_error_list_pdtor);
        TSRMLS_FETCH();
 -       DBG_ENTER(mysqlnd_ps_error_list_pdtor);
        if (element-error) {
                mnd_pefree(element-error, TRUE);
        }

 Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
 ===
 --- php/php-src/trunk/ext/mysqlnd/mysqlnd.c     2011-09-16 06:15:42 UTC (rev 
 316845)
 +++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c     2011-09-16 06:55:43 UTC (rev 
 316846)
 @@ -75,8 +75,8 @@
  mysqlnd_error_list_pdtor(void * pDest)
  {
        MYSQLND_ERROR_LIST_ELEMENT * element = (MYSQLND_ERROR_LIST_ELEMENT *) 
 pDest;
 +       DBG_ENTER(mysqlnd_error_list_pdtor);
        TSRMLS_FETCH();
 -       DBG_ENTER(mysqlnd_error_list_pdtor);
        if (element-error) {
                mnd_pefree(element-error, TRUE);
        }

 Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
 ===
 --- php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c  2011-09-16 06:15:42 UTC (rev 
 316845)
 +++ php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c  2011-09-16 06:55:43 UTC (rev 
 316846)
 @@ -58,8 +58,8 @@
  mysqlnd_ps_error_list_pdtor(void * pDest)
  {
        MYSQLND_ERROR_LIST_ELEMENT * element = (MYSQLND_ERROR_LIST_ELEMENT *) 
 pDest;
 +       DBG_ENTER(mysqlnd_ps_error_list_pdtor);
        TSRMLS_FETCH();
 -       DBG_ENTER(mysqlnd_ps_error_list_pdtor);
        if (element-error) {
                mnd_pefree(element-error, TRUE);
        }


 --
 PHP CVS Mailing List (http://www.php.net/)
 To unsubscribe, visit: http://www.php.net/unsub.php


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php