Skip to content

Commit cf9cdf4

Browse files
committed
update 3
1 parent fc436cf commit cf9cdf4

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From eded359bf69fbfa86d1a3d703d0fe729b1d80e86 Mon Sep 17 00:00:00 2001
1+
From 14a652b8f1262d0019c5912c9e078e9cdbde6f22 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
@@ -13,29 +13,29 @@ Subject: [PATCH 24/24] Do not define pid_t as it might conflict with the
1313
5 files changed, 13 insertions(+), 2 deletions(-)
1414

1515
diff --git a/Modules/_testcapi/long.c b/Modules/_testcapi/long.c
16-
index 769c3909ea3..c150516bcbc 100644
16+
index 769c3909ea3..242636c7cc4 100644
1717
--- a/Modules/_testcapi/long.c
1818
+++ b/Modules/_testcapi/long.c
1919
@@ -6,6 +6,10 @@
2020
#include "util.h"
2121
#include "clinic/long.c.h"
2222

23-
+#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_APP) || defined(MS_WINDOWS_SYSTEM))
23+
+#ifdef _MSC_VER
2424
+typedef int pid_t;
2525
+#endif
2626
+
2727
/*[clinic input]
2828
module _testcapi
2929
[clinic start generated code]*/
3030
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
31-
index 01b6bd89d13..fc587ed1681 100644
31+
index 01b6bd89d13..a811ed8d493 100644
3232
--- a/Modules/_testcapimodule.c
3333
+++ b/Modules/_testcapimodule.c
3434
@@ -23,6 +23,10 @@
3535
# include <sys/wait.h> // W_STOPCODE
3636
#endif
3737

38-
+#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_APP) || defined(MS_WINDOWS_SYSTEM))
38+
+#ifdef _MSC_VER
3939
+typedef int pid_t;
4040
+#endif
4141
+

0 commit comments

Comments
 (0)