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/win32k/include/OS2KLDR.h

    r6229 r21916  
    3636
    3737/* ote_flags */
    38 #ifndef __EXE386__
     38#if !defined(__EXE386__) && !defined(_LXexe_h_)
    3939  #define OBJREAD       0x00000001L     /* Readable Object */
    4040  #define OBJWRITE      0x00000002L     /* Writeable Object */
    … …  
    4747#endif
    4848#define OBJZEROFIL      0x00000100L     /* Object has zero-filled pages */
    49 #ifndef __EXE386__
     49#if !defined(__EXE386__) && !defined(_LXexe_h_)
    5050  #define OBJRESIDENT   0x00000200L     /* Object is resident */
    5151  #define OBJCONTIG     0x00000300L     /* Object is resident and contiguous */
Note: See TracChangeset for help on using the changeset viewer.