Changeset 726 for branches/1.3/xcache.h


Ignore:
Timestamp:
2011-04-09T14:59:31+02:00 (3 years ago)
Author:
moo
Message:

merge from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/xcache.h

    r700 r726  
    2222 
    2323#define HAVE_INODE 
    24 #if !defined(ZEND_ENGINE_2_1) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1 || PHP_MAJOR_VERSION > 5) 
     24#if !defined(ZEND_ENGINE_2_4) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION >= 99 || PHP_MAJOR_VERSION > 5) 
     25#   define ZEND_ENGINE_2_4 
     26#endif 
     27#if !defined(ZEND_ENGINE_2_3) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 3 || defined(ZEND_ENGINE_2_4)) 
     28#   define ZEND_ENGINE_2_3 
     29#endif 
     30#if !defined(ZEND_ENGINE_2_2) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 2 || defined(ZEND_ENGINE_2_3)) 
     31#   define ZEND_ENGINE_2_2 
     32#endif 
     33#if !defined(ZEND_ENGINE_2_1) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 1 || defined(ZEND_ENGINE_2_2)) 
    2534#   define ZEND_ENGINE_2_1 
    26 #endif 
    27 #if !defined(ZEND_ENGINE_2_2) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 2 || PHP_MAJOR_VERSION > 5) 
    28 #   define ZEND_ENGINE_2_2 
    29 #endif 
    30 #if !defined(ZEND_ENGINE_2_3) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3 || PHP_MAJOR_VERSION > 5) 
    31 #   define ZEND_ENGINE_2_3 
    3235#endif 
    3336 
     
    8992#   define add_assoc_null_ex my_add_assoc_null_ex 
    9093#endif 
     94 
     95#ifdef ZEND_ENGINE_2_4 
     96#   define Z_OP(op) (op) 
     97#   define Z_OP_CONSTANT(op) (op).literal->constant 
     98#   define Z_OP_TYPE(op) op##_##type 
     99 
     100#   define Z_CLASS_INFO(className) (className).info.user 
     101#else 
     102#   define Z_OP(op) (op).u 
     103#   define Z_OP_CONSTANT(op) (op).u.constant 
     104#   define Z_OP_TYPE(op) (op).op_type 
     105typedef znode znode_op; 
     106 
     107#   define Z_CLASS_INFO(className) (className) 
     108#endif 
     109 
    91110/* }}} */ 
    92111 
Note: See TracChangeset for help on using the changeset viewer.