gh-129539: Include sysexits.h before checking EX_OK

Previously the macro would be redefined when the header was included.
python · Feb 1, 2025 · 4d1df0d · 4d1df0d
1 parent d89a5f6
commit 4d1df0d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Misc/NEWS.d/next/Build/2025-01-31-19-01-24.gh-issue-129539.6ndioH.rst b/Misc/NEWS.d/next/Build/2025-01-31-19-01-24.gh-issue-129539.6ndioH.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
@@ -52,10 +52,6 @@
 #  include "winreparse.h"
 #endif
 
-#if !defined(EX_OK) && defined(EXIT_SUCCESS)
-#  define EX_OK EXIT_SUCCESS
-#endif
-
 #ifdef __APPLE__
  /* Needed for the implementation of os.statvfs */
 #  include <sys/param.h>
@@ -292,7 +288,11 @@ corresponding Unix manual entries for more information on calls.");
 #endif
 
 #ifdef HAVE_SYSEXITS_H
-#  include <sysexits.h>
+#  include <sysexits.h>           //  EX_OK
+#endif
+
+#if !defined(EX_OK) && defined(EXIT_SUCCESS)
+#  define EX_OK EXIT_SUCCESS
 #endif
 
 #ifdef HAVE_SYS_LOADAVG_H
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Don't redefine ``EX_OK`` when the system has the ``sysexits.h`` header.