From: Zackery Spytz <zspytz@gmail.com>
Date: Thu, 28 Dec 2023 10:47:44 +0000 (-0800)
Subject: bpo-11102: Make configure enable major(), makedev(), and minor() on HP-UX (GH-19856)
X-Git-Tag: v3.13.0a3~234
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f108468970bf4e70910862476900f924fb701399;p=thirdparty%2FPython%2Fcpython.git

bpo-11102: Make configure enable major(), makedev(), and minor() on HP-UX (GH-19856)

Always include <sys/types.h> before <sys/sysmacros.h>.

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
---

diff --git a/Misc/NEWS.d/next/Build/2020-05-01-23-44-31.bpo-11102.Fw9zeS.rst b/Misc/NEWS.d/next/Build/2020-05-01-23-44-31.bpo-11102.Fw9zeS.rst
new file mode 100644
index 000000000000..6477538edf55
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2020-05-01-23-44-31.bpo-11102.Fw9zeS.rst
@@ -0,0 +1,2 @@
+The :func:`os.major`, :func:`os.makedev`, and :func:`os.minor` functions are
+now available on HP-UX v3.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index c635fd4d993d..f4a18536e8f1 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -236,15 +236,16 @@ corresponding Unix manual entries for more information on calls.");
 #  include <sys/uio.h>
 #endif
 
+#ifdef HAVE_SYS_TYPES_H
+/* Should be included before <sys/sysmacros.h> on HP-UX v3 */
+#  include <sys/types.h>
+#endif /* HAVE_SYS_TYPES_H */
+
 #ifdef HAVE_SYS_SYSMACROS_H
 /* GNU C Library: major(), minor(), makedev() */
 #  include <sys/sysmacros.h>
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-#  include <sys/types.h>
-#endif /* HAVE_SYS_TYPES_H */
-
 #ifdef HAVE_SYS_STAT_H
 #  include <sys/stat.h>
 #endif /* HAVE_SYS_STAT_H */
diff --git a/configure b/configure
index 6d65d3abc181..3322b7a682dd 100755
--- a/configure
+++ b/configure
@@ -21805,6 +21805,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #if defined(MAJOR_IN_MKDEV)
 #include <sys/mkdev.h>
 #elif defined(MAJOR_IN_SYSMACROS)
+#include <sys/types.h>
 #include <sys/sysmacros.h>
 #else
 #include <sys/types.h>
diff --git a/configure.ac b/configure.ac
index bfdabc4474e5..13a6d746763d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5102,6 +5102,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #if defined(MAJOR_IN_MKDEV)
 #include <sys/mkdev.h>
 #elif defined(MAJOR_IN_SYSMACROS)
+#include <sys/types.h>
 #include <sys/sysmacros.h>
 #else
 #include <sys/types.h>