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

    r21457 r21916  
    3434#include "oslibmem.h"
    3535
    36 #include <win\thread.h>
     36#include <win/thread.h>
    3737#include "thread.h"
    3838#include "asmutil.h"
    … …  
    6565    HANDLE       hThread = pHMHandleData->hHMHandle;
    6666
    67     if(lpIDThread == NULL) { 
     67    if(lpIDThread == NULL) {
    6868        lpIDThread = &threadid;
    6969    }
    … …  
    124124
    125125    *lpIDThread = MAKE_THREADID(O32_GetCurrentProcessId(), *lpIDThread);
    126    
     126
    127127    TEB *teb = GetTEBFromThreadHandle(hThread);
    128128    if(teb) {
    … …  
    134134
    135135    dprintf(("CreateThread created %08x, id %x", pHMHandleData->hHMHandle, *lpIDThread));
    136  
     136
    137137    return pHMHandleData->hHMHandle;
    138138}
    … …  
    603603           pHMHandleData->hHMHandle,
    604604           dwTimeout));
    605  
     605
    606606  //This doesn't work very well in Open32 (object's state never signaled)
    607607  if(threadobj && threadobj->dwState == THREAD_TERMINATED) {
Note: See TracChangeset for help on using the changeset viewer.