From aec043a7381dec0b510775af6c366adfa7caf42c Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Sat, 14 Dec 2024 09:10:56 -0500 Subject: [PATCH] update errno patches --- patches/3.10/02-freebsd-errno.patch | 24 ++++++++++++------------ patches/3.11/02-freebsd-errno.patch | 14 +++++++------- patches/3.12/02-freebsd-errno.patch | 14 +++++++------- patches/3.9/02-freebsd-errno.patch | 24 ++++++++++++------------ 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/patches/3.10/02-freebsd-errno.patch b/patches/3.10/02-freebsd-errno.patch index eee81ce..4b3a1ad 100644 --- a/patches/3.10/02-freebsd-errno.patch +++ b/patches/3.10/02-freebsd-errno.patch @@ -1,16 +1,16 @@ diff --git a/Include/Python.h b/Include/Python.h -index fb2d32d7110..5b684c7079d 100644 +index d3186c32e35..55ed6a1e634 100644 --- a/Include/Python.h +++ b/Include/Python.h -@@ -34,6 +34,11 @@ - // version 3.13 and newer. - #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000 - # include // errno -+# if defined(__FreeBSD__) -+# ifndef EWOULDBLOCK -+# define EWOULDBLOCK EAGAIN /* Operation would block */ -+# endif +@@ -30,6 +30,11 @@ + #include + #ifdef HAVE_ERRNO_H + #include ++#if defined(__FreeBSD__) ++# ifndef EWOULDBLOCK ++# define EWOULDBLOCK EAGAIN +# endif - # include // FILE* - # include // getenv() - # include // memcpy() ++#endif + #endif + #include + #ifndef MS_WINDOWS diff --git a/patches/3.11/02-freebsd-errno.patch b/patches/3.11/02-freebsd-errno.patch index eee81ce..2738ec2 100644 --- a/patches/3.11/02-freebsd-errno.patch +++ b/patches/3.11/02-freebsd-errno.patch @@ -1,16 +1,16 @@ diff --git a/Include/Python.h b/Include/Python.h -index fb2d32d7110..5b684c7079d 100644 +index 52a7aac6ba6..54fc034b90c 100644 --- a/Include/Python.h +++ b/Include/Python.h -@@ -34,6 +34,11 @@ - // version 3.13 and newer. - #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000 +@@ -23,6 +23,11 @@ + # include + # include // FILE* # include // errno +# if defined(__FreeBSD__) +# ifndef EWOULDBLOCK -+# define EWOULDBLOCK EAGAIN /* Operation would block */ ++# define EWOULDBLOCK EAGAIN +# endif +# endif - # include // FILE* - # include // getenv() # include // memcpy() + #endif + #ifndef MS_WINDOWS diff --git a/patches/3.12/02-freebsd-errno.patch b/patches/3.12/02-freebsd-errno.patch index eee81ce..2738ec2 100644 --- a/patches/3.12/02-freebsd-errno.patch +++ b/patches/3.12/02-freebsd-errno.patch @@ -1,16 +1,16 @@ diff --git a/Include/Python.h b/Include/Python.h -index fb2d32d7110..5b684c7079d 100644 +index 52a7aac6ba6..54fc034b90c 100644 --- a/Include/Python.h +++ b/Include/Python.h -@@ -34,6 +34,11 @@ - // version 3.13 and newer. - #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000 +@@ -23,6 +23,11 @@ + # include + # include // FILE* # include // errno +# if defined(__FreeBSD__) +# ifndef EWOULDBLOCK -+# define EWOULDBLOCK EAGAIN /* Operation would block */ ++# define EWOULDBLOCK EAGAIN +# endif +# endif - # include // FILE* - # include // getenv() # include // memcpy() + #endif + #ifndef MS_WINDOWS diff --git a/patches/3.9/02-freebsd-errno.patch b/patches/3.9/02-freebsd-errno.patch index eee81ce..4b3a1ad 100644 --- a/patches/3.9/02-freebsd-errno.patch +++ b/patches/3.9/02-freebsd-errno.patch @@ -1,16 +1,16 @@ diff --git a/Include/Python.h b/Include/Python.h -index fb2d32d7110..5b684c7079d 100644 +index d3186c32e35..55ed6a1e634 100644 --- a/Include/Python.h +++ b/Include/Python.h -@@ -34,6 +34,11 @@ - // version 3.13 and newer. - #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000 - # include // errno -+# if defined(__FreeBSD__) -+# ifndef EWOULDBLOCK -+# define EWOULDBLOCK EAGAIN /* Operation would block */ -+# endif +@@ -30,6 +30,11 @@ + #include + #ifdef HAVE_ERRNO_H + #include ++#if defined(__FreeBSD__) ++# ifndef EWOULDBLOCK ++# define EWOULDBLOCK EAGAIN +# endif - # include // FILE* - # include // getenv() - # include // memcpy() ++#endif + #endif + #include + #ifndef MS_WINDOWS