From: Victor Stinner <vstinner@python.org>
Date: Mon, 3 Feb 2025 12:00:10 +0000 (+0100)
Subject: [3.12] gh-129539: Include sysexits.h before checking EX_OK (#129590) (#129609)
X-Git-Tag: v3.12.9~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6186021c14624f089107956703d359e5d00dcd58;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-129539: Include sysexits.h before checking EX_OK (#129590) (#129609)

[3.13] gh-129539: Include sysexits.h before checking EX_OK (#129590)

Previously, the macro would be redefined when the header was included.

(cherry picked from commit 65f3432ac32f92bc3d8b7b11103a56c5a70049c0)

Co-authored-by: Collin Funk <collin.funk1@gmail.com>
---

diff --git a/Misc/NEWS.d/next/Build/2025-02-02-09-11-45.gh-issue-129539.SYXXCg.rst b/Misc/NEWS.d/next/Build/2025-02-02-09-11-45.gh-issue-129539.SYXXCg.rst
new file mode 100644
index 000000000000..9781dc05b648
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2025-02-02-09-11-45.gh-issue-129539.SYXXCg.rst
@@ -0,0 +1 @@
+Don't redefine ``EX_OK`` when the system has the ``sysexits.h`` header.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index c386f15b1714..c21c6f06c729 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -49,10 +49,6 @@
 #  include "winreparse.h"
 #endif
 
-#if !defined(EX_OK) && defined(EXIT_SUCCESS)
-#  define EX_OK EXIT_SUCCESS
-#endif
-
 /* On android API level 21, 'AT_EACCESS' is not declared although
  * HAVE_FACCESSAT is defined. */
 #ifdef __ANDROID__
@@ -270,6 +266,10 @@ corresponding Unix manual entries for more information on calls.");
 #  include <sysexits.h>
 #endif
 
+#if !defined(EX_OK) && defined(EXIT_SUCCESS)
+#  define EX_OK EXIT_SUCCESS
+#endif
+
 #ifdef HAVE_SYS_LOADAVG_H
 #  include <sys/loadavg.h>
 #endif