derick                                   Tue, 06 Jul 2010 19:10:27 +0000

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

Log:
- The Lemon branch.

Changed paths:
    A + php/php-src/branches/LEMON/
        (from php/php-src/trunk/:r301028)
    U   php/php-src/branches/LEMON/Zend/zend_language_scanner_defs.h
    U   php/php-src/branches/LEMON/main/main.c
    U   php/php-src/branches/LEMON/main/php_main.h

Modified: php/php-src/branches/LEMON/Zend/zend_language_scanner_defs.h
===================================================================
--- php/php-src/trunk/Zend/zend_language_scanner_defs.h 2010-07-06 17:01:30 UTC 
(rev 301028)
+++ php/php-src/branches/LEMON/Zend/zend_language_scanner_defs.h        
2010-07-06 19:10:27 UTC (rev 301029)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon May 24 14:07:57 2010 */
+/* Generated by re2c 0.13.5 on Tue May 25 10:04:31 2010 */
 #line 3 "Zend/zend_language_scanner_defs.h"

 enum YYCONDTYPE {

Modified: php/php-src/branches/LEMON/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c       2010-07-06 17:01:30 UTC (rev 301028)
+++ php/php-src/branches/LEMON/main/main.c      2010-07-06 19:10:27 UTC (rev 
301029)
@@ -507,6 +507,11 @@
 static int module_startup = 1;
 static int module_shutdown = 0;

+PHPAPI int php_module_initialized(void)
+{
+       return module_initialized;
+}
+
 /* {{{ php_during_module_startup */
 static int php_during_module_startup(void)
 {

Modified: php/php-src/branches/LEMON/main/php_main.h
===================================================================
--- php/php-src/trunk/main/php_main.h   2010-07-06 17:01:30 UTC (rev 301028)
+++ php/php-src/branches/LEMON/main/php_main.h  2010-07-06 19:10:27 UTC (rev 
301029)
@@ -27,6 +27,7 @@
 #include "SAPI.h"

 BEGIN_EXTERN_C()
+PHPAPI int php_module_initialized(void);
 PHPAPI int php_request_startup(TSRMLS_D);
 PHPAPI void php_request_shutdown(void *dummy);
 PHPAPI void php_request_shutdown_for_exec(void *dummy);

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

Reply via email to