Changeset 1489


Ignore:
Timestamp:
2014-05-27T17:54:45+02:00 (5 months ago)
Author:
moo
Message:

fix build for pre-5.6

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/devel/sample.cpp.php

    r1488 r1489  
    4545    static public $static_const11 = array(self::CONST_VALUE => self::CONST_VALUE); 
    4646    static public $static_const12 = array(ClassName::CONST_VALUE => ClassName::CONST_VALUE); 
     47#if PHP_VERSION >= 560 
    4748    static public $ast_binop = ClassName::CONST_VALUE + ClassName::CONST_VALUE; 
    4849    static public $ast_and = ClassName::CONST_VALUE && 1; 
     
    5152    static public $ast_unaryPlus = +ClassName::CONST_VALUE; 
    5253    static public $ast_unaryMinus = -ClassName::CONST_VALUE; 
     54#endif 
    5355    /** doc */ 
    5456    static public $public_static = array(2, 'str'); 
  • trunk/lib/Decompiler.class.php

    r1488 r1489  
    649649                XC_JMPZ_EX             => "&&", 
    650650                XC_JMPNZ_EX            => "||", 
    651  
    652                 // zend_ast 
    653                 ZEND_BOOL_AND          => '&&', 
    654                 ZEND_BOOL_OR           => '||', 
    655651                ); 
     652        if (defined('IS_CONSTANT_AST')) { 
     653            $this->binops[ZEND_BOOL_AND] = '&&'; 
     654            $this->binops[ZEND_BOOL_OR]  = '||'; 
     655        } 
    656656        // }}} 
    657657        $this->includeTypes = array( // {{{ 
  • trunk/xcache/xc_compatibility.h

    r1486 r1489  
    9898#endif 
    9999/* }}} */ 
     100 
     101#ifndef ZEND_ENGINE_2_6 
     102typedef void zend_ast; 
     103#endif 
    100104 
    101105#ifdef ZEND_ENGINE_2_4 
Note: See TracChangeset for help on using the changeset viewer.