|
1 | | -From 14a652b8f1262d0019c5912c9e078e9cdbde6f22 Mon Sep 17 00:00:00 2001 |
| 1 | +From 27e9a62dcc30d5713cdb709b93cd455af94a837d Mon Sep 17 00:00:00 2001 |
2 | 2 | From: Isuru Fernando <isuruf@gmail.com> |
3 | 3 | Date: Sun, 12 Jan 2025 10:37:29 +0530 |
4 | 4 | Subject: [PATCH 24/24] Do not define pid_t as it might conflict with the |
5 | 5 | actual definition |
6 | 6 |
|
7 | 7 | --- |
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(-) |
14 | 15 |
|
15 | 16 | diff --git a/Modules/_testcapi/long.c b/Modules/_testcapi/long.c |
16 | 17 | index 769c3909ea3..242636c7cc4 100644 |
@@ -42,6 +43,21 @@ index 01b6bd89d13..a811ed8d493 100644 |
42 | 43 | #ifdef bool |
43 | 44 | # error "The public headers should not include <stdbool.h>, see gh-48924" |
44 | 45 | #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]*/ |
45 | 61 | diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h |
46 | 62 | index 14a6efb9ac9..7b67d867778 100644 |
47 | 63 | --- a/Modules/clinic/posixmodule.c.h |
@@ -82,6 +98,3 @@ index 424421f6ff1..2c1b5a5b834 100644 |
82 | 98 | /* define some ANSI types that are not defined in earlier Win headers */ |
83 | 99 | #if _MSC_VER >= 1200 |
84 | 100 | /* This file only exists in VC 6.0 or higher */ |
85 | | --- |
86 | | -2.44.0 |
87 | | - |
|
0 commit comments