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/exceptutil.h

    r21619 r21916  
    2020void  __cdecl SetExceptionChain(DWORD);
    2121
    22 extern "C" PVOID QueryExceptionChain();
     22PVOID QueryExceptionChain();
    2323
    24 void OS2SetExceptionHandler(void *exceptframe);
    25 void OS2UnsetExceptionHandler(void *exceptframe);
     24void SYSTEM OS2SetExceptionHandler(void *exceptframe);
     25void SYSTEM OS2UnsetExceptionHandler(void *exceptframe);
    2626
    2727#ifdef DEBUG
Note: See TracChangeset for help on using the changeset viewer.