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

    r21567 r21916  
    1313
    1414#define DBG_LOCALLOG    DBG_trace
    15 #include <dbglocal.h>
     15#include "dbglocal.h"
    1616
    1717#define DBGWRAP_MODULE "KERNEL32"
    1818#include <dbgwrap.h>
    1919
     20extern "C" {
    2021
    2122BOOL WINAPI TryEnterCriticalSection( CRITICAL_SECTION *crit );
    … …  
    950951DEBUGWRAP_LVL2_12(OemToCharBuffW)
    951952DEBUGWRAP_LVL2_8(OemToCharW)
     953
     954} // extern "C"
Note: See TracChangeset for help on using the changeset viewer.