Changeset 625 for branches/1.3/xcache.h

Show
Ignore:
Timestamp:
07/05/2009 11:01:49 AM (4 years ago)
Author:
moo
Message:

merged r541:559 from trunk

Location:
branches/1.3
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/1.3

  • branches/1.3/xcache.h

    r623 r625  
    66#define XCACHE_COPYRIGHT  "Copyright (c) 2005-2009" 
    77#define XCACHE_URL        "http://xcache.lighttpd.net" 
     8#define XCACHE_WIKI_URL   XCACHE_URL "/wiki" 
    89 
    910#include <php.h> 
    … …  
    3940#endif 
    4041 
    41 #ifdef ALLOCA_FLAG 
     42#ifdef do_alloca_with_limit 
     43#   define my_do_alloca(size, use_heap) do_alloca_with_limit(size, use_heap) 
     44#   define my_free_alloca(size, use_heap) free_alloca_with_limit(size, use_heap) 
     45#elif defined(ALLOCA_FLAG) 
    4246#   define my_do_alloca(size, use_heap) do_alloca(size, use_heap) 
    4347#   define my_free_alloca(size, use_heap) free_alloca(size, use_heap) 
    … …  
    238242    ulong     h; 
    239243    xc_cest_t cest; 
     244#ifndef ZEND_COMPILE_DELAYED_BINDING 
    240245    int       oplineno; 
     246#endif 
    241247} xc_classinfo_t; 
    242248/* }}} */ 
    … …  
    299305    zend_uint classinfo_cnt; 
    300306    xc_classinfo_t *classinfos; 
     307#ifndef ZEND_COMPILE_DELAYED_BINDING 
    301308    zend_bool have_early_binding; 
     309#endif 
    302310 
    303311#ifdef ZEND_ENGINE_2_1