Skip to content

Cleanup: Mostly remove _VCRT_ALLOW_INTERNALS #5636

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

Merged
Stephan T. Lavavej (StephanTLavavej) merged 1 commit into from
Jul 15, 2025
Merged

Cleanup: Mostly remove _VCRT_ALLOW_INTERNALS #5636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "")

# Toolset options must appear before add_library() for the options to take effect.
add_compile_definitions(_CRTBLD _VCRT_ALLOW_INTERNALS _HAS_OLD_IOSTREAMS_MEMBERS=1)
add_compile_definitions(_CRTBLD _HAS_OLD_IOSTREAMS_MEMBERS=1)

# /Z7 for MSVC, /Zi for MASM
set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "Embedded")
Expand Down
1 change: 0 additions & 1 deletion stl/msbuild/stl_1/msvcp_1.settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
<LibOutputFileName>msvcprt_1$(BuildSuffix)$(ClrLibSuffix)</LibOutputFileName>
<LibOutputFile>$(LibOutputFileName).lib</LibOutputFile>

<ClDefines>_VCRT_ALLOW_INTERNALS;$(ClDefines)</ClDefines>
<ClDefines Condition="'$(MsvcpFlavor)' == 'app'">$(ClDefines);_CRT_APP</ClDefines>

<UseMsvcrt>false</UseMsvcrt>
Expand Down
1 change: 0 additions & 1 deletion stl/msbuild/stl_2/msvcp_2.settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
<LibOutputFileName>msvcprt_2$(BuildSuffix)$(ClrLibSuffix)</LibOutputFileName>
<LibOutputFile>$(LibOutputFileName).lib</LibOutputFile>

<ClDefines>_VCRT_ALLOW_INTERNALS;$(ClDefines)</ClDefines>
<ClDefines Condition="'$(MsvcpFlavor)' == 'app'">$(ClDefines);_CRT_APP</ClDefines>

<UseMsvcrt>false</UseMsvcrt>
Expand Down
1 change: 0 additions & 1 deletion stl/msbuild/stl_atomic_wait/msvcp_atomic_wait.settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
<LibOutputFileName>msvcprt$(BuildSuffix)_atomic_wait$(ClrLibSuffix)</LibOutputFileName>
<LibOutputFile>$(LibOutputFileName).lib</LibOutputFile>

<ClDefines>_VCRT_ALLOW_INTERNALS;$(ClDefines)</ClDefines>
<ClDefines Condition="'$(MsvcpFlavor)' == 'app'">$(ClDefines);_CRT_APP</ClDefines>

<UseMsvcrt>false</UseMsvcrt>
Expand Down
2 changes: 1 addition & 1 deletion stl/msbuild/stl_base/libcp.settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

<PropertyGroup>
<ClProgramDataBaseFileName>$(OutputLibPdbPath)$(OutputName)$(PdbVerName).pdb</ClProgramDataBaseFileName>
<ClDefines>$(ClDefines);_VCRT_ALLOW_INTERNALS;_ANNOTATE_STL</ClDefines>
<ClDefines>$(ClDefines);_ANNOTATE_STL</ClDefines>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)\stl.files.settings.targets"/>
Expand Down
1 change: 0 additions & 1 deletion stl/msbuild/stl_base/msvcp.settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
<LibOutputFileName>msvcprt_base$(BuildSuffix)$(ClrLibSuffix)</LibOutputFileName>
<LibOutputFile>$(LibOutputFileName).lib</LibOutputFile>

<ClDefines>_VCRT_ALLOW_INTERNALS;$(ClDefines)</ClDefines>
<ClDefines Condition="'$(MsvcpFlavor)' == 'app'">$(ClDefines);_CRT_APP</ClDefines>

<UseMsvcrt>false</UseMsvcrt>
Expand Down
1 change: 0 additions & 1 deletion stl/msbuild/stl_codecvt_ids/msvcp_codecvt_ids.settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
<LibOutputFileName>msvcprt$(BuildSuffix)_codecvt_ids$(ClrLibSuffix)</LibOutputFileName>
<LibOutputFile>$(LibOutputFileName).lib</LibOutputFile>

<ClDefines>_VCRT_ALLOW_INTERNALS;$(ClDefines)</ClDefines>
<ClDefines Condition="'$(MsvcpFlavor)' == 'app'">$(ClDefines);_CRT_APP</ClDefines>

<UseMsvcrt>false</UseMsvcrt>
Expand Down
2 changes: 1 addition & 1 deletion stl/src/excptptr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#ifndef _VCRT_ALLOW_INTERNALS
#define _VCRT_ALLOW_INTERNALS
#endif // !defined(_VCRT_ALLOW_INTERNALS)
#endif

#include <Unknwn.h>
#include <cstdlib> // for abort
Expand Down
4 changes: 4 additions & 0 deletions stl/src/pplerror.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
// Copyright (c) Microsoft Corporation.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#ifndef _VCRT_ALLOW_INTERNALS
#define _VCRT_ALLOW_INTERNALS
#endif

#include <ppltasks.h>

#if defined(_CRT_APP) || defined(UNDOCKED_WINDOWS_UCRT)
Expand Down