Ignore:
Timestamp:
2013-09-29T04:55:11+02:00 (21 months ago)
Author:
Xuefer
Message:

merge from trunk: remove asm from processor, it just cant be implemented in processor

Location:
branches/3.0
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0

    • Property svn:mergeinfo changed
      /trunkmerged: 1416
  • branches/3.0/processor/hashtable.m4

    r1356 r1417  
    7575
    7676#if defined(HARDENING_PATCH_HASH_PROTECT) && HARDENING_PATCH_HASH_PROTECT
    77         IFASM(`dst->canary = zend_hash_canary; DONE(canary)', `
    78         dnl elseif
    79             IFRESTORE(`dst->canary = zend_hash_canary; DONE(canary)', `
    80                 dnl else
    81                 PROCESS(unsigned int, canary)
    82             ')
     77        IFRESTORE(`dst->canary = zend_hash_canary; DONE(canary)', `
     78            dnl else
     79            PROCESS(unsigned int, canary)
    8380        ')
    8481#endif
Note: See TracChangeset for help on using the changeset viewer.