Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/kernel32/seh/sehutil.s

    r21662 r21916  
    178178    subl $4, %esp
    179179    movl %eax, 0(%esp)
    180     call odin_malloc /* _Optlink, rtl, EAX/EDX/ECX-in, caller cleans stack */
     180    call _malloc /* __cdecl (and _Optlink compatible -> EAX/EDX/ECX-in) */
    181181    addl $4, %esp
    182182    testl %eax, %eax
    … …  
    223223    subl $4, %esp
    224224    movl %eax, 0(%esp)
    225     call odin_free /* _Optlink, rtl, EAX/EDX/ECX-in, caller cleans stack */
     225    call _free /* __cdecl (and _Optlink compatible -> EAX/EDX/ECX-in) */
    226226    addl $4, %esp
    227227
Note: See TracChangeset for help on using the changeset viewer.