diff options
| author | Pierre Joye <pajoye@php.net> | 2010-02-11 21:17:13 (GMT) |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2010-02-11 21:17:13 (GMT) |
| commit | 15a3c450b73546df862128fa020ed4d10424767d (patch) | |
| tree | ff5068a1d11a774bcc2730e65731fd01ba357966 /Zend | |
| parent | ad9bbf26abda3304f5658b0656d1ef6bc365a28a (diff) | |
| download | php-15a3c450b73546df862128fa020ed4d10424767d.tar.gz | |
- those are in 5.3.2 now, merge to 5.3.2 section is coming
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_API.c | 1 | ||||
| -rw-r--r-- | Zend/zend_language_scanner.c | 2 | ||||
| -rw-r--r-- | Zend/zend_language_scanner_defs.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 87a160c..5433dc1 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1607,7 +1607,6 @@ ZEND_API int zend_startup_module_ex(zend_module_entry *module TSRMLS_DC) /* {{{ } #endif } - if (module->module_startup_func) { EG(current_module) = module; if (module->module_startup_func(module->type, module->module_number TSRMLS_CC)==FAILURE) { diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index bb3b013..3816310 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Mon Nov 16 23:30:01 2009 */ +/* Generated by re2c 0.13.5 on Mon Jan 11 14:20:20 2010 */ #line 1 "Zend/zend_language_scanner.l" /* +----------------------------------------------------------------------+ diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h index b2bce82..020966a 100644 --- a/Zend/zend_language_scanner_defs.h +++ b/Zend/zend_language_scanner_defs.h @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Thu Sep 10 15:34:33 2009 */ +/* Generated by re2c 0.13.5 on Mon Jan 11 14:20:20 2010 */ #line 3 "Zend/zend_language_scanner_defs.h" enum YYCONDTYPE { |