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

    r8838 r21916  
    146146     LPASYNCIOREQUEST     pending[NR_ASYNC_OPERATIONS];
    147147
    148      friend      DWORD CALLBACK OverlappedIOThread(LPVOID lpThreadParam);
     148     static DWORD CALLBACK OverlappedIOThread(LPVOID lpThreadParam);
    149149};
    150150
Note: See TracChangeset for help on using the changeset viewer.