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

vstinner · collinfunk · web-flow · commit 6186021c1462 · 2025-02-03T12:00:10.000Z
[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 65f3432) 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Don't redefine ``EX_OK`` when the system has the ``sysexits.h`` header.