Changeset 644


Ignore:
Timestamp:
2009-07-06T11:50:01+02:00 (5 years ago)
Author:
moo
Message:

merged r642,r643 from trunk

Location:
branches/1.3
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/Makefile.frag

    r627 r644  
    1212$(XCACHE_STRUCTINFO_OUT): $(XCACHE_INCLUDES_I) $(srcdir)/mkstructinfo.awk 
    1313    @echo $(XCACHE_STRUCTINFO_OUT) is optional if XCache test is not enabled, feel free if it awk failed to produce it 
    14     -$(XCACHE_AWK) -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCTINFO_OUT).tmp && mv -f $(XCACHE_STRUCTINFO_OUT).tmp $(XCACHE_STRUCTINFO_OUT) 
     14    -$(XCACHE_AWK) -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCTINFO_OUT).tmp && mv $(XCACHE_STRUCTINFO_OUT).tmp $(XCACHE_STRUCTINFO_OUT) 
    1515 
    1616$(XCACHE_PROC_OUT): $(XCACHE_PROC_SRC) $(XCACHE_STRUCTINFO_OUT) $(XCACHE_PROC_SOURCES) 
    1717    $(M4) -D srcdir='`'"$(srcdir)'" -D builddir='`'"$(builddir)'" $(XCACHE_ENABLE_TEST) $(XCACHE_PROC_SRC) > $(XCACHE_PROC_OUT).tmp 
    18     mv -f $(XCACHE_PROC_OUT).tmp $(XCACHE_PROC_OUT) 
     18    mv $(XCACHE_PROC_OUT).tmp $(XCACHE_PROC_OUT) 
    1919 
    2020$(XCACHE_PROC_H): $(XCACHE_PROC_OUT) 
    21     $(GREP) 'export: ' $(XCACHE_PROC_OUT) | $(SED) 's/.*export:\(.*\):export.*/\1/g' | $(XCACHE_INDENT) > $(XCACHE_PROC_H).tmp 
    22     mv -f $(XCACHE_PROC_H).tmp $(XCACHE_PROC_H) 
     21    $(GREP) 'export: ' $(XCACHE_PROC_OUT) | $(SED) 's/.*export:\(.*\):export.*/\1/g' > $(XCACHE_PROC_H) 
     22    -$(XCACHE_INDENT) < $(XCACHE_PROC_H) > $(XCACHE_PROC_H).tmp && mv $(XCACHE_PROC_H).tmp $(XCACHE_PROC_H) 
    2323 
    2424$(XCACHE_PROC_C): $(XCACHE_PROC_OUT) $(XCACHE_PROC_H) 
    25     $(XCACHE_INDENT) < $(XCACHE_PROC_OUT) > $(XCACHE_PROC_C).tmp 
    26     mv -f $(XCACHE_PROC_C).tmp $(XCACHE_PROC_C) 
     25    cp $(XCACHE_PROC_OUT) $(XCACHE_PROC_C) 
     26    -$(XCACHE_INDENT) < $(XCACHE_PROC_OUT) > $(XCACHE_PROC_C).tmp && mv $(XCACHE_PROC_C).tmp $(XCACHE_PROC_C) 
    2727 
    2828$(builddir)/processor.lo: $(XCACHE_PROC_C) $(XCACHE_PROC_H) $(srcdir)/processor.c 
  • branches/1.3/config.w32

    r604 r644  
    116116    frag = frag.replace(/.*\$\(CC\).* -E (.*) -o (.*)/, ccrule + " /E $1 > $2"); 
    117117    frag = frag.replace(/ -o /g, " /Fo"); 
    118     frag = frag.replace(/mv -f /g, "move "); 
     118    frag = frag.replace(/cp /g, "copy "); 
     119    frag = frag.replace(/mv /g, "move "); 
    119120    frag = frag.replace(/ \|\| /g, "\r\n\tif errorlevel 1 "); 
    120121    frag = frag.replace(/ && /g, "\r\n\tif not errorlevel 1 "); 
  • branches/1.3/processor/processor.m4

    r630 r644  
    220220DEF_STRUCT_P_FUNC(`zend_arg_info', , ` 
    221221    DISPATCH(zend_uint, name_len) 
    222     PROC_ZSTRING_L(, name, name_len) 
     222    COPY(name) 
    223223    DISPATCH(zend_uint, class_name_len) 
    224     PROC_ZSTRING_L(, class_name, class_name_len) 
     224    COPY(class_name) 
    225225    DISPATCH(zend_bool, array_type_hint) 
    226226    DISPATCH(zend_bool, allow_null) 
Note: See TracChangeset for help on using the changeset viewer.