diff options
| author | Jonghyun Park <parjong@gmail.com> | 2016-12-08 10:25:38 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2016-12-08 02:25:38 +0100 |
| commit | 6665345c5a6e6e7fcc5b2fcb36c0f536e773648e (patch) | |
| tree | dca07950d52c54d9db1c263247dea1f52d03a4bb /src/vm/util.cpp | |
| parent | 79f22fd6b8a0c4f884421a63cfa9054ced1b2cfd (diff) | |
| download | coreclr-6665345c5a6e6e7fcc5b2fcb36c0f536e773648e.tar.gz coreclr-6665345c5a6e6e7fcc5b2fcb36c0f536e773648e.tar.bz2 coreclr-6665345c5a6e6e7fcc5b2fcb36c0f536e773648e.zip | |
[x86/Linux] Fix inconsistent GetCLRFunction definitions (#8472)
* [x86/Linux] Fix inconsistency in GetCLRFunction definitions
GetCLRFunction is treated as pfnGetCLRFunction_t which has __stdcall
convention, but is implemented without __stdcall.
This inconsistency causes segmentaion fault while initializing CoreCLR
for x86/Linux.
This commit fixes such inconsistency via adding __stdcall to
GetCLRFunction implementation.
In addition, this commit declares GetCLRFuntion in 'utilcode.h' and
and revises .cpp files to include 'utilcode.h' instead of declaring
'GetCLRFunction'.
* Remove unnecessary includes
* Remove another unnecessay include
Diffstat (limited to 'src/vm/util.cpp')
| -rw-r--r-- | src/vm/util.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vm/util.cpp b/src/vm/util.cpp index a96a56cd58..2cf6f7f31c 100644 --- a/src/vm/util.cpp +++ b/src/vm/util.cpp @@ -2551,7 +2551,7 @@ extern BOOL EEHeapFreeInProcessHeap(DWORD dwFlags, LPVOID lpMem); extern void ShutdownRuntimeWithoutExiting(int exitCode); extern BOOL IsRuntimeStarted(DWORD *pdwStartupFlags); -void * GetCLRFunction(LPCSTR FunctionName) +void * __stdcall GetCLRFunction(LPCSTR FunctionName) { void* func = NULL; |