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.

Sign up for GitHub

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

Jump to bottom

Windows: Remove MSVC define redundant with _MSC_VER #82304

Merged
merged 1 commit into from
Sep 26, 2023
Merged

Windows: Remove MSVC define redundant with _MSC_VER #82304

merged 1 commit into from
Sep 26, 2023

Conversation

akien-mga
Copy link
Member

@akien-mga akien-mga added this to the 4.2 milestone Sep 25, 2023
@akien-mga akien-mga requested review from a team as code owners September 25, 2023 13:16
@akien-mga akien-mga mentioned this pull request Sep 25, 2023
Merged
bruvzg
bruvzg reviewed Sep 25, 2023
View reviewed changes
Copy link
Member

@bruvzg bruvzg left a comment

Choose a reason for hiding this comment

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

It's alos used in

godot/platform/windows/crash_handler_windows.h

Line 38 in df0a822

#if defined(DEBUG_ENABLED) && defined(MSVC)

@akien-mga akien-mga force-pushed the windows-remove-redundant-MSVC-define branch from 238e9e3 to cf8e4a8 Compare September 25, 2023 13:17
@akien-mga
Copy link
Member Author

Indeed, thanks. Just noticed that one too.

akien-mga
akien-mga commented Sep 25, 2023
View reviewed changes
drivers/unix/file_access_unix.cpp Outdated
@@ -44,7 +44,7 @@
#include <unistd.h>
#endif

#ifdef MSVC
#ifdef _MSC_VER
Copy link
Member Author

Choose a reason for hiding this comment

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

I wonder if that isn't dead code btw. In what condition would we build this with MSVC since it's under UNIX_ENABLED?

Copy link
Member Author

Choose a reason for hiding this comment

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

I removed all that code, which seemed partially copied from FileAccessWindows.

@akien-mga
Windows: Remove MSVC define redundant with _MSC_VER
814ab59 
Cleanup unused MSVC code in FileAccessUnix.
@akien-mga akien-mga force-pushed the windows-remove-redundant-MSVC-define branch from cf8e4a8 to 814ab59 Compare September 26, 2023 09:11
@akien-mga akien-mga requested a review from bruvzg September 26, 2023 09:35
@akien-mga akien-mga merged commit a4bca12 into godotengine:master Sep 26, 2023
@akien-mga akien-mga deleted the windows-remove-redundant-MSVC-define branch September 26, 2023 11:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bruvzg bruvzg bruvzg approved these changes

Assignees
No one assigned
Labels
enhancement platform:windows topic:buildsystem
Projects
None yet
Milestone
4.2
Development

Successfully merging this pull request may close these issues.
2 participants
@akien-mga @bruvzg