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/thunk.cpp

    r8449 r21916  
    2323#define DBG_LOCALLOG    DBG_thunk
    2424#include "dbglocal.h"
     25
     26extern "C" {
    2527
    2628/************************************************************************
    … …  
    405407void WINAPI SUnMapLS_IP_EBP_40(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,40); }
    406408
     409} // extern "C"
     410
Note: See TracChangeset for help on using the changeset viewer.