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/include/win/ntdef.h

    r21419 r21916  
    99#endif
    1010
    11 #define NTAPI   __stdcall 
     11#define NTAPI   __stdcall
    1212
    1313#ifndef IN
    … …  
    2727#endif
    2828
     29#ifndef WINE_NTSTATUS_DECLARED
     30#define WINE_NTSTATUS_DECLARED
    2931typedef LONG NTSTATUS;
     32#endif
     33#ifndef WINE_PNTSTATUS_DECLARED
     34#define WINE_PNTSTATUS_DECLARED
    3035typedef NTSTATUS *PNTSTATUS;
     36#endif
    3137
     38typedef char *PSZ;
    3239typedef CONST char *PCSZ;
    3340
    3441typedef short CSHORT;
    35 typedef CSHORT *PCSHORT; 
     42typedef CSHORT *PCSHORT;
    3643
    3744/* NT lowlevel Strings (handled by Rtl* functions in NTDLL)
    … …  
    7380#define OBJ_VALID_ATTRIBUTES    0x000003F2L
    7481
    75 typedef struct _OBJECT_ATTRIBUTES 
     82typedef struct _OBJECT_ATTRIBUTES
    7683{   ULONG Length;
    7784    HANDLE RootDirectory;
Note: See TracChangeset for help on using the changeset viewer.