Skip to content

Commit 66ca064

Browse files
committed
update 4
1 parent cf9cdf4 commit 66ca064

1 file changed

Lines changed: 23 additions & 10 deletions

File tree

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

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
From 14a652b8f1262d0019c5912c9e078e9cdbde6f22 Mon Sep 17 00:00:00 2001
1+
From 27e9a62dcc30d5713cdb709b93cd455af94a837d Mon Sep 17 00:00:00 2001
22
From: Isuru Fernando <isuruf@gmail.com>
33
Date: Sun, 12 Jan 2025 10:37:29 +0530
44
Subject: [PATCH 24/24] Do not define pid_t as it might conflict with the
55
actual definition
66

77
---
8-
Modules/_testcapi/long.c | 4 ++++
9-
Modules/_testcapimodule.c | 4 ++++
10-
Modules/clinic/posixmodule.c.h | 4 ++++
11-
Modules/posixmodule.c | 1 +
12-
PC/pyconfig.h.in | 2 --
13-
5 files changed, 13 insertions(+), 2 deletions(-)
8+
Modules/_testcapi/long.c | 4 ++++
9+
Modules/_testcapimodule.c | 4 ++++
10+
Modules/_testlimitedcapi/long.c | 4 ++++
11+
Modules/clinic/posixmodule.c.h | 4 ++++
12+
Modules/posixmodule.c | 1 +
13+
PC/pyconfig.h.in | 2 --
14+
6 files changed, 17 insertions(+), 2 deletions(-)
1415

1516
diff --git a/Modules/_testcapi/long.c b/Modules/_testcapi/long.c
1617
index 769c3909ea3..242636c7cc4 100644
@@ -42,6 +43,21 @@ index 01b6bd89d13..a811ed8d493 100644
4243
#ifdef bool
4344
# error "The public headers should not include <stdbool.h>, see gh-48924"
4445
#endif
46+
diff --git a/Modules/_testlimitedcapi/long.c b/Modules/_testlimitedcapi/long.c
47+
index 5953009b6ef..299ea06d8f5 100644
48+
--- a/Modules/_testlimitedcapi/long.c
49+
+++ b/Modules/_testlimitedcapi/long.c
50+
@@ -8,6 +8,10 @@
51+
#include "util.h"
52+
#include "clinic/long.c.h"
53+
54+
+#ifdef _MSC_VER
55+
+typedef int pid_t;
56+
+#endif
57+
+
58+
/*[clinic input]
59+
module _testlimitedcapi
60+
[clinic start generated code]*/
4561
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
4662
index 14a6efb9ac9..7b67d867778 100644
4763
--- a/Modules/clinic/posixmodule.c.h
@@ -82,6 +98,3 @@ index 424421f6ff1..2c1b5a5b834 100644
8298
/* define some ANSI types that are not defined in earlier Win headers */
8399
#if _MSC_VER >= 1200
84100
/* This file only exists in VC 6.0 or higher */
85-
--
86-
2.44.0
87-

0 commit comments

Comments
 (0)