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

    r21626 r21916  
    2626#include <cpuhlp.h>
    2727#include <wprocess.h>
    28 #include <windllbase.h>
    29 #include <winexebase.h>
     28#include "windllbase.h"
     29#include "winexebase.h"
    3030#include "exceptutil.h"
    3131#include "oslibmisc.h"
    … …  
    6161//******************************************************************************
    6262//******************************************************************************
     63extern "C"
    6364HANDLE WIN32API CreateThread(LPSECURITY_ATTRIBUTES  lpsa,
    6465                             DWORD                  cbStack,
    … …  
    115116  return pHandle->hmHandleData.hWin32Handle;
    116117}
     118
     119extern "C" {
     120
    117121/*****************************************************************************
    118122 * Name      : HMGetThreadPriority
    … …  
    370374  return (lpResult);                                  /* deliver return code */
    371375}
     376
     377} // extern "C"
     378
    372379/*****************************************************************************
    373380 * Name      : HMSetThreadTerminated
    … …  
    397404  return (lpResult);                                  /* deliver return code */
    398405}
     406
     407extern "C" {
     408
    399409//******************************************************************************
    400410//******************************************************************************
    … …  
    459469#define MAX_CALLSTACK_SIZE 128
    460470#ifdef DEBUG
    461 static char *pszLastCaller = NULL;
     471static const char *pszLastCaller = NULL;
    462472#endif
    463473//******************************************************************************
    464 void WIN32API dbg_ThreadPushCall(char *pszCaller)
     474void WIN32API dbg_ThreadPushCall(const char *pszCaller)
    465475{
    466476#ifdef DEBUG
    … …  
    654664  return FALSE;
    655665}
     666
     667} // extern "C"
     668
    656669//******************************************************************************
    657670//******************************************************************************
    … …  
    670683//******************************************************************************
    671684//******************************************************************************
    672 DWORD OPEN32API Win32ThreadProc(LPVOID lpData)
     685DWORD OPEN32API Win32Thread::Win32ThreadProc(LPVOID lpData)
    673686{
    674687    EXCEPTION_FRAME  exceptFrame;
Note: See TracChangeset for help on using the changeset viewer.