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/ntddk.h

    r21327 r21916  
    876876
    877877/*      mathematics */
    878 #if defined(__WIN32OS2__) && defined(__IBMC__)
     878#if defined(__WIN32OS2__) && defined(WINE_LARGE_INTEGER) && !defined(WINE_LONGLONG)
     879
    879880LARGE_INTEGER  WINAPI RtlpConvertLongToLargeInteger( LONG a );
    880881LARGE_INTEGER  WINAPI RtlpEnlargedIntegerMultiply( INT a, INT b );
Note: See TracChangeset for help on using the changeset viewer.