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/kernel32/os2heap.h

    r7728 r21916  
    4242    ~OS2Heap();
    4343
    44     HANDLE INLINE getHeapHandle()  { return(hPrimaryHeap); };
     44    HANDLE getHeapHandle()  { return(hPrimaryHeap); };
    4545
    4646    LPVOID Alloc(DWORD dwFlags, DWORD dwBytes);
Note: See TracChangeset for help on using the changeset viewer.