Skip to content

Commit bdf0823

Browse files
committed
fix compilation
1 parent 60b06a9 commit bdf0823

1 file changed

Lines changed: 35 additions & 3 deletions

File tree

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

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,42 @@
1-
From 4fb09595193ab713507e90ecda0d85e5378f9ca0 Mon Sep 17 00:00:00 2001
1+
From dec22f500af594289870ec2ecc08d3f3b7d034a0 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-
PC/pyconfig.h.in | 2 --
9-
1 file changed, 2 deletions(-)
8+
Modules/clinic/posixmodule.c.h | 4 ++++
9+
Modules/posixmodule.c | 1 +
10+
PC/pyconfig.h.in | 2 --
11+
3 files changed, 5 insertions(+), 2 deletions(-)
1012

13+
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
14+
index 14a6efb9ac9..7b67d867778 100644
15+
--- a/Modules/clinic/posixmodule.c.h
16+
+++ b/Modules/clinic/posixmodule.c.h
17+
@@ -10,6 +10,10 @@ preserve
18+
#include "pycore_long.h" // _PyLong_UnsignedInt_Converter()
19+
#include "pycore_modsupport.h" // _PyArg_UnpackKeywords()
20+
21+
+#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_APP) || defined(MS_WINDOWS_SYSTEM))
22+
+typedef int pid_t;
23+
+#endif
24+
+
25+
PyDoc_STRVAR(os_stat__doc__,
26+
"stat($module, /, path, *, dir_fd=None, follow_symlinks=True)\n"
27+
"--\n"
28+
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
29+
index 51e34b5f4b7..d88b1c7fee9 100644
30+
--- a/Modules/posixmodule.c
31+
+++ b/Modules/posixmodule.c
32+
@@ -42,6 +42,7 @@
33+
# if defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)
34+
# define HAVE_SYMLINK
35+
# endif /* MS_WINDOWS_DESKTOP | MS_WINDOWS_SYSTEM */
36+
+# typedef int pid_t;
37+
#endif
38+
39+
#ifndef MS_WINDOWS
1140
diff --git a/PC/pyconfig.h.in b/PC/pyconfig.h.in
1241
index 424421f6ff1..2c1b5a5b834 100644
1342
--- a/PC/pyconfig.h.in
@@ -21,3 +50,6 @@ index 424421f6ff1..2c1b5a5b834 100644
2150
/* define some ANSI types that are not defined in earlier Win headers */
2251
#if _MSC_VER >= 1200
2352
/* This file only exists in VC 6.0 or higher */
53+
--
54+
2.44.0
55+

0 commit comments

Comments
 (0)