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

Compile spotlight.h only when Spotlight is enabled #578

Merged
2 commits merged into from
Dec 10, 2023
Merged

Conversation

rdmark
Copy link
Member

@rdmark rdmark commented Dec 8, 2023

The dalloc.h header depends on talloc so it shouldn't be imported without the Spotlight toolchain.

Also, the symbols in spotlight.h aren't needed without Spotlight to let's ifdef them away (unless there's a more graceful way to do this?)

Copy link

sonarcloud bot commented Dec 8, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

warning The version of Java (11.0.17) you have used to run this analysis is deprecated and we will stop accepting it soon. Please update to at least Java 17.
Read more here

@ghost
Copy link

ghost commented Dec 9, 2023

@rdmark, please can we use the cleaner fix in PR #579 as the code changes are more consistent with how other headers are treated e.g those associated with ACL support?

@rdmark
Copy link
Member Author

rdmark commented Dec 9, 2023

@dgsga Sure, we can use your fix.

In fact, why don't we do both? My approach is consistent with f.e. ldapconfig.h and the HAVE_LDAP macro: https://github.com/Netatalk/netatalk/blob/main/include/atalk/ldapconfig.h

There may be a good reason not to, but I thought it was worth a conversation. :)

@ghost ghost merged commit 22df409 into main Dec 10, 2023
5 checks passed
@ghost
Copy link

ghost commented Dec 10, 2023

@rdmark, I have merged your PR and only the macOS workflow fix component of mine as this seems the best of both worlds.

@rdmark rdmark deleted the rdmark-issue-577 branch December 17, 2023 10:29
ghost pushed a commit that referenced this pull request May 19, 2024
* Compile spotlight.h only when Spotlight is enabled, #577

* Remove orphaned USE_BUILTIN_TALLOC conditionals
ghost pushed a commit that referenced this pull request May 19, 2024
* Compile spotlight.h only when Spotlight is enabled, #577

* Remove orphaned USE_BUILTIN_TALLOC conditionals
This pull request was closed.
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.

None yet

1 participant