Revert unrelated changes

zooba · Sep 29, 2023 · 8deec70 · 8deec70
1 parent 3bf0d92
commit 8deec70
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -6222,19 +6222,7 @@ sslmodule_init_lock(PyObject *module)
     return 0;
 }
 
-#ifdef MS_WINDOWS
-static int
-sslmodule_init_applink(PyObject *module)
-{
-    OPENSSL_ProvideApplink();
-    return 0;
-}
-#endif
-
 static PyModuleDef_Slot sslmodule_slots[] = {
-#ifdef MS_WINDOWS
-    {Py_mod_exec, sslmodule_init_applink},
-#endif
     {Py_mod_exec, sslmodule_init_types},
     {Py_mod_exec, sslmodule_init_exceptions},
     {Py_mod_exec, sslmodule_init_socketapi},

diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj
@@ -99,7 +99,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\Modules\_ssl.c" />
-    <ClCompile Include="$(opensslDir)\ms\applink.c">
+    <ClCompile Include="$(opensslIncludeDir)\applink.c">
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemGroup>

diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj
@@ -67,14 +67,14 @@
 set VCINSTALLDIR=$(VCInstallDir)
 if not exist "$(IntDir.TrimEnd('\'))" mkdir "$(IntDir.TrimEnd('\'))"
 cd /D "$(IntDir.TrimEnd('\'))"
-rem $(Perl) "$(opensslDir)\configure" $(OpenSSLPlatform) no-asm
+$(Perl) "$(opensslDir)\configure" $(OpenSSLPlatform) no-asm
 nmake
 </NMakeBuildCommandLine>
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 
-  <Target Name="_PatchUplink" BeforeTargets="Build" Condition="false">
+  <Target Name="_PatchUplink" BeforeTargets="Build">
     <PropertyGroup>
       <Uplink>$(opensslDir)\ms\uplink.c</Uplink>
       <BeforePatch>((h = GetModuleHandle(NULL)) == NULL)</BeforePatch>