diff options
Diffstat (limited to 'src/inc/corcompile.h')
| -rw-r--r-- | src/inc/corcompile.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/inc/corcompile.h b/src/inc/corcompile.h index 3b517ae212..9cd072008a 100644 --- a/src/inc/corcompile.h +++ b/src/inc/corcompile.h @@ -22,11 +22,11 @@ #error FEATURE_PREJIT is required for this file #endif // FEATURE_PREJIT -#if !defined(_TARGET_X86_) +#if !defined(_TARGET_X86_) || defined(FEATURE_PAL) #ifndef WIN64EXCEPTIONS #define WIN64EXCEPTIONS #endif -#endif // !_TARGET_X86_ +#endif // !_TARGET_X86_ || FEATURE_PAL #include <cor.h> #include <corhdr.h> @@ -72,16 +72,6 @@ typedef DPTR(struct CORCOMPILE_IMPORT_SECTION) PTR_CORCOMPILE_IMPORT_SECTION; #ifdef _TARGET_X86_ -#ifndef FEATURE_PAL -// -// x86 ABI does not define RUNTIME_FUNCTION. Define our own to allow unification between x86 and other platforms. -// -typedef struct _RUNTIME_FUNCTION { - DWORD BeginAddress; - DWORD UnwindData; -} RUNTIME_FUNCTION, *PRUNTIME_FUNCTION; - -#endif // !FEATURE_PAL typedef DPTR(RUNTIME_FUNCTION) PTR_RUNTIME_FUNCTION; @@ -1466,14 +1456,13 @@ class ICorCompilationDomain /********************************************************************************* * ICorCompileInfo is the interface for a compiler *********************************************************************************/ - // Define function pointer ENCODEMODULE_CALLBACK -typedef DWORD (__stdcall *ENCODEMODULE_CALLBACK)(LPVOID pModuleContext, CORINFO_MODULE_HANDLE moduleHandle); +typedef DWORD (*ENCODEMODULE_CALLBACK)(LPVOID pModuleContext, CORINFO_MODULE_HANDLE moduleHandle); // Define function pointer DEFINETOKEN_CALLBACK -typedef void (__stdcall *DEFINETOKEN_CALLBACK)(LPVOID pModuleContext, CORINFO_MODULE_HANDLE moduleHandle, DWORD index, mdTypeRef* token); +typedef void (*DEFINETOKEN_CALLBACK)(LPVOID pModuleContext, CORINFO_MODULE_HANDLE moduleHandle, DWORD index, mdTypeRef* token); -typedef HRESULT (__stdcall *CROSS_DOMAIN_CALLBACK)(LPVOID pArgs); +typedef HRESULT (*CROSS_DOMAIN_CALLBACK)(LPVOID pArgs); class ICorCompileInfo { |