Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

[x86/Linux] Fix compile error redifinition RUNTIME_FUNCTION#8249

Merged
janvorli merged 1 commit into
dotnet:masterfrom
seanshpark:x86pal03
Nov 23, 2016
Merged

[x86/Linux] Fix compile error redifinition RUNTIME_FUNCTION#8249
janvorli merged 1 commit into
dotnet:masterfrom
seanshpark:x86pal03

Conversation

@seanshpark
Copy link
Copy Markdown

@seanshpark seanshpark commented Nov 22, 2016

Add !FEATURE_PAL directive for x86 as RUNTIME_FUNCTION is defined in pal

@seanshpark
Copy link
Copy Markdown
Author

@janvorli , @jkotas , @gkhanna79 , PTAL

Comment thread src/inc/corcompile.h Outdated
PTR_CORCOMPILE_IMPORT_SECTION;

#ifdef _TARGET_X86_
#if defined(_TARGET_X86_) && defined(WIN32)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, we should use !defined(FEATURE_PAL) instead of defined(WIN32) everywhere. I have scanned our sources and we don't use WIN32 anywhere except for the PAL tests, which has historical reasons.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, thank you :)

Add !FEATURE_PAL directive for x86 as RUNTIME_FUNCTION is defined in pal
@seanshpark
Copy link
Copy Markdown
Author

Changed to use !defined(FEATURE_PAL)

Copy link
Copy Markdown
Member

@janvorli janvorli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you!

@janvorli janvorli merged commit 20f48eb into dotnet:master Nov 23, 2016
@seanshpark seanshpark deleted the x86pal03 branch November 23, 2016 04:22
sergign60 pushed a commit to sergign60/coreclr that referenced this pull request Dec 2, 2016
)

Add !FEATURE_PAL directive for x86 as RUNTIME_FUNCTION is defined in pal
@karelz karelz modified the milestone: 2.0.0 Aug 28, 2017
picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022
…oreclr#8249)

Add !FEATURE_PAL directive for x86 as RUNTIME_FUNCTION is defined in pal

Commit migrated from dotnet/coreclr@20f48eb
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants