8000 Merge branch 'main' into fix-py-debug-sysconfig · python/cpython@78f13d4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 78f13d4

Browse files
XuehaiPanXuehaiPan
committed
Merge branch 'main' into fix-py-debug-sysconfig
2 parents 25ae994 + 9127b46 commit 78f13d4

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

‎Modules/_ssl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6111,7 +6111,7 @@ _ssl_enum_certificates_impl(PyObject *module, const char *store_name)
61116111
return PyErr_SetFromWindowsErr(GetLastError());
61126112
}
61136113

6114-
while (pCertCtx = CertEnumCertificatesInStore(hCollectionStore, pCertCtx)) {
6114+
while ((pCertCtx = CertEnumCertificatesInStore(hCollectionStore, pCertCtx))) {
61156115
cert = PyBytes_FromStringAndSize((const char*)pCertCtx->pbCertEncoded,
61166116
pCertCtx->cbCertEncoded);
61176117
if (!cert) {
@@ -6210,7 +6210,7 @@ _ssl_enum_crls_impl(PyObject *module, const char *store_name)
62106210
return PyErr_SetFromWindowsErr(GetLastError());
62116211
}
62126212

6213-
while (pCrlCtx = CertEnumCRLsInStore(hCollectionStore, pCrlCtx)) {
6213+
while ((pCrlCtx = CertEnumCRLsInStore(hCollectionStore, pCrlCtx))) {
62146214
crl = PyBytes_FromStringAndSize((const char*)pCrlCtx->pbCrlEncoded,
62156215
pCrlCtx->cbCrlEncoded);
62166216
if (!crl) {

‎Modules/_winapi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ _winapi_CreateJunction_impl(PyObject *module, LPCWSTR src_path,
609609
/* overallocate by a few array elements */
610610
LUID_AND_ATTRIBUTES privs[4];
611611
} tp, previousTp;
612-
int previousTpSize = 0;
612+
DWORD previousTpSize = 0;
613613

614614
/* Reparse data buffer */
615615
const USHORT prefix_len = 4;

‎Modules/posixmodule.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5372,7 +5372,7 @@ _testFileExistsByName(LPCWSTR path, BOOL followLinks)
53725372
sizeof(info)))
53735373
{
53745374
if (!(info.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) ||
5375-
!followLinks && IsReparseTagNameSurrogate(info.ReparseTag))
5375+
(!followLinks && IsReparseTagNameSurrogate(info.ReparseTag)))
53765376
{
53775377
return TRUE;
53785378
}

‎PC/launcher2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2760,7 +2760,7 @@ process(int argc, wchar_t ** argv)
27602760
// We searched earlier, so if we didn't find anything, now we react
27612761
exitCode = searchExitCode;
27622762
// If none found, and if permitted, install it
2763-
if (exitCode == RC_NO_PYTHON && isEnvVarSet(L"PYLAUNCHER_ALLOW_INSTALL") ||
2763+
if (((exitCode == RC_NO_PYTHON) && isEnvVarSet(L"PYLAUNCHER_ALLOW_INSTALL")) ||
27642764
isEnvVarSet(L"PYLAUNCHER_ALWAYS_INSTALL")) {
27652765
exitCode = installEnvironment(&search);
27662766
if (!exitCode) {

‎PCbuild/liblzma.vcxproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@
9393
<ClCompile>
9494
<PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9595
<AdditionalIncludeDirectories>$(lzmaDir)windows/vs2019;$(lzmaDir)src/liblzma/common;$(lzmaDir)src/common;$(lzmaDir)src/liblzma/api;$(lzmaDir)src/liblzma/check;$(lzmaDir)src/liblzma/delta;$(lzmaDir)src/liblzma/lz;$(lzmaDir)src/liblzma/lzma;$(lzmaDir)src/liblzma/rangecoder;$(lzmaDir)src/liblzma/simple;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
96-
<DisableSpecificWarnings>4028;4113;4133;4244;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
96+
<DisableSpecificWarnings>4244;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
97+
<AdditionalOptions Condition="$(PlatformToolset) == 'ClangCL'">%(AdditionalOptions) -Wno-deprecated-declarations</AdditionalOptions>
9798
</ClCompile>
9899
</ItemDefinitionGroup>
99100
<ItemGroup>

‎PCbuild/sqlite3.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
<AdditionalIncludeDirectories>$(sqlite3Dir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
101101
<PreprocessorDefinitions>SQLITE_ENABLE_MATH_FUNCTIONS;SQLITE_ENABLE_FTS4;SQLITE_ENABLE_FTS5;SQLITE_ENABLE_RTREE;SQLITE_OMIT_AUTOINIT;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions)</PreprocessorDefinitions>
102102
<WarningLevel>Level1</WarningLevel>
103+
<AdditionalOptions Condition="$(PlatformToolset) == 'ClangCL'">%(AdditionalOptions) -Wno-unused</AdditionalOptions>
103104
</ClCompile>
104105
<ResourceCompile>
105106
<PreprocessorDefinitions>SQLITE_VERSION=$(SqliteVersion);SQLITE_MAJOR_VERSION=$(SqliteMajorVersion);SQLITE_MINOR_VERSION=$(SqliteMinorVersion);SQLITE_MICRO_VERSION=$(SqliteMicroVersion);SQLITE_PATCH_VERSION=$(SqlitePatchVersion);%(PreprocessorDefinitions)</PreprocessorDefinitions>

0 commit comments

Comments
 (0)
0