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

    r21434 r21916  
    1919#include <string.h>
    2020#include <stdlib.h>
     21#ifndef __GNUC__
    2122#include <iostream.h>
    2223#include <fstream.h>
     24#endif
    2325#include <misc.h>
    2426#include <win32type.h>
    25 #include <winexelx.h>
     27#include "winexelx.h"
    2628#include <winconst.h>
    2729#include <win32api.h>
Note: See TracChangeset for help on using the changeset viewer.