colder                                   Fri, 09 Jul 2010 11:39:27 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=301120

Log:
guard tsrm inside a ifdef, remains to specify it at the time of the lemon call

Changed paths:
    U   php/php-src/branches/LEMON/Zend/zend_language_parser.y

Modified: php/php-src/branches/LEMON/Zend/zend_language_parser.y
===================================================================
--- php/php-src/branches/LEMON/Zend/zend_language_parser.y      2010-07-09 
11:28:40 UTC (rev 301119)
+++ php/php-src/branches/LEMON/Zend/zend_language_parser.y      2010-07-09 
11:39:27 UTC (rev 301120)
@@ -46,7 +46,9 @@

 %token_type {znode}

-%extra_argument {void ***tsrm_ls}
+%ifdef ZTS
+    %extra_argument {void ***tsrm_ls}
+%endif

 %type function_call_ns_i {znode_array}
 %type function_call_ns_ii {znode_array}
@@ -78,7 +80,6 @@


 /* TOKENS TRANSLATION:
-
    , => T_COMMA
    = => T_EQUAL
    ( => T_LPAREN

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

Reply via email to