From 40e73c5ac4849fdbeb58850bf93de7f2c581f26e Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 15 Oct 2021 11:33:00 -0400 Subject: Source: Fix typo in _WIN32 preprocessor checks Since CMake's default compiler flags with MSVC include `-DWIN32` for historical reasons, a few preprocessor conditions were accidentally checking for `WIN32` instead of `_WIN32`. The corresponding blocks were left out when compiling official binaries for `cmake.org` because we hard-code compiler flags without `-DWIN32`. Fixes: #22764 --- Source/CPack/cmCPackDebGenerator.cxx | 2 +- Source/cmFileCopier.cxx | 2 +- Source/cmLocalNinjaGenerator.cxx | 2 +- Source/cmcmd.cxx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 560e5c1..7515d33 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -211,7 +211,7 @@ bool DebGenerator::generateDataTar() const cmCPackLogger(cmCPackLog::LOG_DEBUG, "RELATIVEDIR: \"" << relativeDir << "\"" << std::endl); -#ifdef WIN32 +#ifdef _WIN32 std::string mode_t_adt_filename = file + ":cmake_mode_t"; cmsys::ifstream permissionStream(mode_t_adt_filename.c_str()); diff --git a/Source/cmFileCopier.cxx b/Source/cmFileCopier.cxx index 48fc286..237d234 100644 --- a/Source/cmFileCopier.cxx +++ b/Source/cmFileCopier.cxx @@ -72,7 +72,7 @@ bool cmFileCopier::SetPermissions(const std::string& toFile, mode_t permissions) { if (permissions) { -#ifdef WIN32 +#ifdef _WIN32 if (Makefile->IsOn("CMAKE_CROSSCOMPILING")) { // Store the mode in an NTFS alternate stream. std::string mode_t_adt_filename = toFile + ":cmake_mode_t"; diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index ad782ee..3540579 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -85,7 +85,7 @@ void cmLocalNinjaGenerator::Generate() cmGlobalNinjaGenerator::WriteComment(this->GetRulesFileStream(), "localized /showIncludes string"); this->GetRulesFileStream() << "msvc_deps_prefix = "; -#ifdef WIN32 +#ifdef _WIN32 // Ninja uses the ANSI Windows APIs, so strings in the rules file // typically need to be ANSI encoded. However, in this case the compiler // is being invoked using the UTF-8 codepage so the /showIncludes prefix diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index e2ff8b7..613593a 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -1334,7 +1334,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector const& args, cmSystemTools::Error("Problem extracting tar: " + outFile); return 1; } -#ifdef WIN32 +#ifdef _WIN32 // OK, on windows 7 after we untar some files, // sometimes we can not rename the directory after // the untar is done. This breaks the external project -- cgit v0.12