Changeset 274

Show
Ignore:
Timestamp:
09/18/06 13:05:52 (2 years ago)
Author:
hans
Message:

some more ifdef fixing

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • eaccelerator/trunk/ea_restore.c

    r271 r274  
    667667        to->name = emalloc(from->name_length + 1); 
    668668        memcpy(to->name, from->name, from->name_length + 1); 
    669 #ifdef ZEND_ENGINE_2_1 
    670 #ifdef INCLUDE_DOC_COMMENTS 
    671      if (from->doc_comment != NULL) { 
    672      to->doc_comment = emalloc(from->doc_comment_len + 1); 
    673      memcpy(to->doc_comment, from->doc_comment, from->doc_comment_len + 1); 
    674      } 
    675 #else 
    676     to->doc_comment_len = 0; 
    677     to->doc_comment = NULL; 
    678 #endif 
    679 #ifdef ZEND_ENGINE_2_2 
    680     to->ce = EAG(class_entry); 
    681 #endif 
     669#  ifdef ZEND_ENGINE_2_1 
     670#    ifdef INCLUDE_DOC_COMMENTS 
     671        if (from->doc_comment != NULL) { 
     672                to->doc_comment = emalloc(from->doc_comment_len + 1); 
     673                memcpy(to->doc_comment, from->doc_comment, from->doc_comment_len + 1); 
     674        } 
     675#    else 
     676        to->doc_comment_len = 0; 
     677        to->doc_comment = NULL; 
     678#    endif 
     679#    ifdef ZEND_ENGINE_2_2 
     680        to->ce = EAG(class_entry); 
     681#    endif 
     682#  endif 
    682683        return to; 
    683684}