Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move ARM_NEON definition and fix possible double define #3735

Merged
merged 1 commit into from
Jan 3, 2023

Conversation

lgritz
Copy link
Collaborator

@lgritz lgritz commented Jan 3, 2023

It should not have been set in platform.h (inside the cpuid function!) in the first place. And apparently, though this was ok for Windows ARM, on Mac ARM it's an error because that symbol is already defined. So only redefine it if it's currently undefined. And move the whole check and definition into simd.h where all the other ARM_NEON stuff lives.

It should not have been set in platform.h (inside the cpuid function!)
in the first place. And apparently, though this was ok for Windows ARM,
on Mac ARM it's an error because that symbol is already defined.
So only redefine it if it's currently undefined. And move the whole
check and definition into simd.h where all the other ARM_NEON stuff
lives.
@lgritz
Copy link
Collaborator Author

lgritz commented Jan 3, 2023

@mikaelsundell and @Gerdya does this look ok to both of you?

@mikaelsundell
Copy link
Contributor

mikaelsundell commented Jan 3, 2023 via email

@lgritz lgritz merged commit d5670ff into AcademySoftwareFoundation:master Jan 3, 2023
@lgritz lgritz deleted the lg-neondef branch January 3, 2023 19:42
lgritz added a commit to lgritz/OpenImageIO that referenced this pull request Jan 3, 2023
…areFoundation#3735)

It should not have been set in platform.h (inside the cpuid function!)
in the first place. And apparently, though this was ok for Windows ARM,
on Mac ARM it's an error because that symbol is already defined.
So only redefine it if it's currently undefined. And move the whole
check and definition into simd.h where all the other ARM_NEON stuff
lives.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants