Changeset 18

Show
Ignore:
Timestamp:
12/18/04 15:34:06 (4 years ago)
Author:
everaldo_canuto
Message:

include some #ifdef to solve comnpilation problens in PHP4.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • eaccelerator/trunk/eaccelerator.c

    r17 r18  
    24402440  to->function_name    = from->function_name; 
    24412441 
     2442#ifdef ZEND_ENGINE_2 
     2443   
    24422444  int    fname_len; 
    24432445  char  *fname_lc; 
     
    24482450    fname_lc  = zend_str_tolower_dup(to->function_name, fname_len); 
    24492451  } 
    2450 #ifdef ZEND_ENGINE_2 
     2452 
    24512453  to->fn_flags         = from->fn_flags; 
    24522454 
     
    26242626                ce->parent != NULL && 
    26252627                zend_hash_find(&ce->parent->function_table, 
     2628#ifdef ZEND_ENGINE_2 
    26262629                        fname_lc, fname_len+1, 
     2630#else 
     2631                        to->function_name, strlen(to->function_name)+1, 
     2632#endif 
    26272633                        (void **) &function)==SUCCESS && 
    26282634                function->type == ZEND_INTERNAL_FUNCTION) 
     
    27632769  { 
    27642770    int   name_len = strlen(from->parent); 
     2771#ifdef ZEND_ENGINE_2     
    27652772    char *name_lc  = zend_str_tolower_dup(from->parent, name_len); 
    27662773 
    27672774    if (zend_hash_find(CG(class_table), (void *)name_lc, name_len+1, (void **)&to->parent) != SUCCESS) 
    2768         { 
     2775#else 
     2776    if (zend_hash_find(CG(class_table), (void *)from->parent, name_len+1, (void **)&to->parent) != SUCCESS) 
     2777#endif 
     2778    { 
    27692779      debug_printf("[%d] EACCELERATOR can't restore parent class " 
    27702780          "\"%s\" of class \"%s\"\n", getpid(), (char*)from->parent, to->name); 
     
    27912801      to->__call = to->parent->__call; 
    27922802          to->create_object = to->parent->create_object; 
     2803    } 
     2804    efree(name_lc); 
    27932805#else 
    27942806          to->handle_property_get  = to->parent->handle_property_get; 
    27952807      to->handle_property_set  = to->parent->handle_property_set; 
    27962808      to->handle_function_call = to->parent->handle_function_call; 
    2797 #endif 
    2798     } 
    2799     efree(name_lc); 
     2809    } 
     2810#endif 
    28002811  } 
    28012812  else