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

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
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/ole32/ifs.c

    r10623 r21916  
    256256 *      win2k:  size originally requested !!! (allocated on 8 byte boundarys)
    257257 */
    258 static DWORD WINAPI IMalloc_fnGetSize(LPMALLOC iface,LPVOID pv) {
     258static DWORD WINAPI IMalloc_fnGetSize(LPCMALLOC iface,LPVOID pv) {
    259259
    260260        DWORD cb;
    … …  
    281281 * IMalloc32_DidAlloc [VTABLE]
    282282 */
    283 static INT WINAPI IMalloc_fnDidAlloc(LPMALLOC iface,LPVOID pv) {
     283static INT WINAPI IMalloc_fnDidAlloc(LPCMALLOC iface,LPVOID pv) {
    284284
    285285        BOOL fSpyed = 0;
    … …  
    305305 * IMalloc32_HeapMinimize [VTABLE]
    306306 */
    307 static VOID WINAPI IMalloc_fnHeapMinimize(LPMALLOC iface) {
     307static LPVOID WINAPI IMalloc_fnHeapMinimize(LPMALLOC iface) {
    308308        TRACE("()\n");
    309309
Note: See TracChangeset for help on using the changeset viewer.