mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Use macros for __stdcall calling convention.

Browse source
This commit is contained in:
Sridhar Periyasamy 2016-02-19 11:30:03 -08:00
parent f96ac6ed92
commit c8215f84d3
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/corehost/cli/coreclr.cpp
View file

@ -9,7 +9,7 @@
static pal::dll_t g_coreclr = nullptr; static pal::dll_t g_coreclr = nullptr;
// Prototype of the coreclr_initialize function from coreclr.dll // Prototype of the coreclr_initialize function from coreclr.dll
typedef pal::hresult_t(__stdcall *coreclr_initialize_fn)( typedef pal::hresult_t(STDMETHODCALLTYPE *coreclr_initialize_fn)(
const char* exePath, const char* exePath,
const char* appDomainFriendlyName, const char* appDomainFriendlyName,
int propertyCount, int propertyCount,
@ -19,12 +19,12 @@ typedef pal::hresult_t(__stdcall *coreclr_initialize_fn)(
unsigned int* domainId); unsigned int* domainId);
// Prototype of the coreclr_shutdown function from coreclr.dll // Prototype of the coreclr_shutdown function from coreclr.dll
typedef pal::hresult_t(__stdcall *coreclr_shutdown_fn)( typedef pal::hresult_t(STDMETHODCALLTYPE *coreclr_shutdown_fn)(
coreclr::host_handle_t hostHandle, coreclr::host_handle_t hostHandle,
unsigned int domainId); unsigned int domainId);
// Prototype of the coreclr_execute_assembly function from coreclr.dll // Prototype of the coreclr_execute_assembly function from coreclr.dll
typedef pal::hresult_t(__stdcall *coreclr_execute_assembly_fn)( typedef pal::hresult_t(STDMETHODCALLTYPE *coreclr_execute_assembly_fn)(
coreclr::host_handle_t hostHandle, coreclr::host_handle_t hostHandle,
unsigned int domainId, unsigned int domainId,
int argc, int argc,

7
src/corehost/common/pal.h
View file

@ -77,6 +77,8 @@ namespace pal
#define SHARED_API #define SHARED_API
#endif #endif
#define STDMETHODCALLTYPE __stdcall
typedef wchar_t char_t; typedef wchar_t char_t;
typedef std::wstring string_t; typedef std::wstring string_t;
typedef std::wstringstream stringstream_t; typedef std::wstringstream stringstream_t;
@ -107,6 +109,11 @@ namespace pal
#define SHARED_API #define SHARED_API
#endif #endif
#define __cdecl /* nothing */
#define __stdcall /* nothing */
#define __fastcall /* nothing */
#define STDMETHODCALLTYPE __stdcall
typedef char char_t; typedef char char_t;
typedef std::string string_t; typedef std::string string_t;
typedef std::stringstream stringstream_t; typedef std::stringstream stringstream_t;