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

    r10397 r21916  
    2727#include <win32type.h>
    2828#include <misc.h>
    29 #include <windllpe2lx.h>
    30 #include <winexepe2lx.h>
     29#include "windllpe2lx.h"
     30#include "winexepe2lx.h"
    3131#include <wprocess.h>
    3232#include <odinpe.h>
    … …  
    4343*******************************************************************************/
    4444extern BOOL fPeLoader;
     45
     46extern "C" {
    4547
    4648/**
    … …  
    134136}
    135137
     138} // extern "C"
    136139
    137140/**
Note: See TracChangeset for help on using the changeset viewer.