Apply pid_t patch (#770)

automerged PR by conda-forge/automerge-action

Author: conda-forge-admin

cpython

@@ -0,0 +1 @@
+Subproject commit 53fb7ef329d078e9bd4b688c5d5951a7d0208031

recipe/meta.yaml

@@ -4,7 +4,7 @@
 {% set ver2 = '.'.join(version.split('.')[0:2]) %}
 {% set ver2nd = ''.join(version.split('.')[0:2]) %}
 {% set ver3nd = ''.join(version.split('.')[0:3]) %}
-{% set build_number = 0 %}
+{% set build_number = 1 %}
 
 # this makes the linter happy
 {% set channel_targets = channel_targets or 'conda-forge main' %}
@@ -75,8 +75,7 @@ source:
 {% if 'conda-forge' in channel_targets %}
       - patches/0023-Brand-conda-forge.patch
 {% endif %}
-      # not ready yet, see #770
-      # - patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch
+      - patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch
 
 build:
   number: {{ build_number }}

recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch

@@ -1,13 +1,90 @@
-From aec73a621751170cfeded380fb6bc71e31493441 Mon Sep 17 00:00:00 2001
+From 27e9a62dcc30d5713cdb709b93cd455af94a837d Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Sun, 12 Jan 2025 10:37:29 +0530
 Subject: [PATCH 24/24] Do not define pid_t as it might conflict with the
  actual definition
 
 ---
- PC/pyconfig.h.in | 2 --
- 1 file changed, 2 deletions(-)
+ Modules/_testcapi/long.c        | 4 ++++
+ Modules/_testcapimodule.c       | 4 ++++
+ Modules/_testlimitedcapi/long.c | 4 ++++
+ Modules/clinic/posixmodule.c.h  | 4 ++++
+ Modules/posixmodule.c           | 1 +
+ PC/pyconfig.h.in                | 2 --
+ 6 files changed, 17 insertions(+), 2 deletions(-)
 
+diff --git a/Modules/_testcapi/long.c b/Modules/_testcapi/long.c
+index 769c3909ea3..242636c7cc4 100644
+--- a/Modules/_testcapi/long.c
++++ b/Modules/_testcapi/long.c
+@@ -6,6 +6,10 @@
+ #include "util.h"
+ #include "clinic/long.c.h"
+ 
++#ifdef _MSC_VER
++typedef int pid_t;
++#endif
++
+ /*[clinic input]
+ module _testcapi
+ [clinic start generated code]*/
+diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
+index 01b6bd89d13..a811ed8d493 100644
+--- a/Modules/_testcapimodule.c
++++ b/Modules/_testcapimodule.c
+@@ -23,6 +23,10 @@
+ #  include <sys/wait.h>           // W_STOPCODE
+ #endif
+ 
++#ifdef _MSC_VER
++typedef int pid_t;
++#endif
++
+ #ifdef bool
+ #  error "The public headers should not include <stdbool.h>, see gh-48924"
+ #endif
+diff --git a/Modules/_testlimitedcapi/long.c b/Modules/_testlimitedcapi/long.c
+index 5953009b6ef..299ea06d8f5 100644
+--- a/Modules/_testlimitedcapi/long.c
++++ b/Modules/_testlimitedcapi/long.c
+@@ -8,6 +8,10 @@
+ #include "util.h"
+ #include "clinic/long.c.h"
+ 
++#ifdef _MSC_VER
++typedef int pid_t;
++#endif
++
+ /*[clinic input]
+ module _testlimitedcapi
+ [clinic start generated code]*/
+diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
+index 14a6efb9ac9..7b67d867778 100644
+--- a/Modules/clinic/posixmodule.c.h
++++ b/Modules/clinic/posixmodule.c.h
+@@ -10,6 +10,10 @@ preserve
+ #include "pycore_long.h"          // _PyLong_UnsignedInt_Converter()
+ #include "pycore_modsupport.h"    // _PyArg_UnpackKeywords()
+ 
++#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_APP) || defined(MS_WINDOWS_SYSTEM))
++typedef int pid_t;
++#endif
++
+ PyDoc_STRVAR(os_stat__doc__,
+ "stat($module, /, path, *, dir_fd=None, follow_symlinks=True)\n"
+ "--\n"
+diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
+index 51e34b5f4b7..9ab26125548 100644
+--- a/Modules/posixmodule.c
++++ b/Modules/posixmodule.c
+@@ -42,6 +42,7 @@
+ #  if defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)
+ #    define HAVE_SYMLINK
+ #  endif /* MS_WINDOWS_DESKTOP | MS_WINDOWS_SYSTEM */
++typedef int pid_t;
+ #endif
+ 
+ #ifndef MS_WINDOWS
 diff --git a/PC/pyconfig.h.in b/PC/pyconfig.h.in
 index 424421f6ff1..2c1b5a5b834 100644
 --- a/PC/pyconfig.h.in