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

Do not redefine SDL_MAIN_HANDLED #70492

Merged
merged 1 commit into from
Dec 29, 2023
Merged

Conversation

Qrox
Copy link
Contributor

@Qrox Qrox commented Dec 28, 2023

Summary

None

Purpose of change

#70415 (comment)

Describe the solution

Skip the definition if already defined.

Testing

Before: https://github.com/CleverRaven/Cataclysm-DDA/actions/runs/7326894681/job/19953089843 (search C4005 for the warning)
After: https://github.com/CleverRaven/Cataclysm-DDA/actions/runs/7347181452/job/20003177433?pr=70492 warning no longer appears.

Additional context

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Dec 28, 2023
@ZhilkinSerg ZhilkinSerg merged commit f7cf4b7 into CleverRaven:master Dec 29, 2023
26 of 28 checks passed
@Qrox Qrox deleted the patch-2 branch January 8, 2024 07:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [C++] Changes (can be) made in C++. Previously named `Code` json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants