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

    r10397 r21916  
    2424#include <string.h>
    2525#include <stdlib.h>
     26#ifndef __GNUC__
    2627#include <iostream.h>
    2728#include <fstream.h>
     29#endif
    2830#include <misc.h>
    2931#include <win32type.h>
    30 #include <windllbase.h>
    31 #include <windlllx.h>
     32#include "windllbase.h"
     33#include "windlllx.h"
    3234#include "winexepe2lx.h"
    3335#include "winexepeldr.h"
Note: See TracChangeset for help on using the changeset viewer.