summaryrefslogtreecommitdiff
path: root/src/coreclr
diff options
context:
space:
mode:
authorJan Vorlicek <janvorli@microsoft.com>2019-02-23 00:19:23 +0100
committerJan Vorlicek <janvorli@microsoft.com>2019-02-23 00:19:23 +0100
commit6470bb0064b6c6dffff056454fdf2ca6dd5aed44 (patch)
treebe13dc65c080669f396ec4bdf17a51082532f2b5 /src/coreclr
parent14aa1d722a52d24745e37b898cb8eed67e0b4094 (diff)
downloadcoreclr-6470bb0064b6c6dffff056454fdf2ca6dd5aed44.tar.gz
coreclr-6470bb0064b6c6dffff056454fdf2ca6dd5aed44.tar.bz2
coreclr-6470bb0064b6c6dffff056454fdf2ca6dd5aed44.zip
Fix the stdcall to be present only for x86 Windows
Diffstat (limited to 'src/coreclr')
-rw-r--r--src/coreclr/hosts/inc/coreclrhost.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/coreclr/hosts/inc/coreclrhost.h b/src/coreclr/hosts/inc/coreclrhost.h
index 457d46bfe3..534f94b28c 100644
--- a/src/coreclr/hosts/inc/coreclrhost.h
+++ b/src/coreclr/hosts/inc/coreclrhost.h
@@ -9,12 +9,18 @@
#ifndef __CORECLR_HOST_H__
#define __CORECLR_HOST_H__
+#if defined(_WIN32) && defined(_M_IX86)
+#define CALLING_CONVENTION __stdcall
+#else
+#define CALLING_CONVENTION
+#endif
+
// For each hosting API, we define a function prototype and a function pointer
// The prototype is useful for implicit linking against the dynamic coreclr
// library and the pointer for explicit dynamic loading (dlopen, LoadLibrary)
#define CORECLR_HOSTING_API(function, ...) \
- extern "C" int __stdcall function(__VA_ARGS__); \
- typedef int (__stdcall *function##_ptr)(__VA_ARGS__)
+ extern "C" int CALLING_CONVENTION function(__VA_ARGS__); \
+ typedef int (CALLING_CONVENTION *function##_ptr)(__VA_ARGS__)
//
// Initialize the CoreCLR. Creates and starts CoreCLR host and creates an app domain