mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-19 08:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

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

(cherry picked from commit f108468970)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
Miss Islington (bot) 2023-12-28 12:12:16 +01:00 • committed by GitHub
parent 72073ca560
commit 0e3cf5bcac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS.d/next/Build/2020-05-01-23-44-31.bpo-11102.Fw9zeS.rst Normal file
View file

@ -0,0 +1,2 @@
The :func:`os.major`, :func:`os.makedev`, and :func:`os.minor` functions are
now available on HP-UX v3.

9
Modules/posixmodule.c
View file

@ -226,15 +226,16 @@ corresponding Unix manual entries for more information on calls.");
# include <sys/uio.h> # include <sys/uio.h>
#endif #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 #ifdef HAVE_SYS_SYSMACROS_H
/* GNU C Library: major(), minor(), makedev() */ /* GNU C Library: major(), minor(), makedev() */
# include <sys/sysmacros.h> # include <sys/sysmacros.h>
#endif #endif
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif /* HAVE_SYS_TYPES_H */
#ifdef HAVE_SYS_STAT_H #ifdef HAVE_SYS_STAT_H
# include <sys/stat.h> # include <sys/stat.h>
#endif /* HAVE_SYS_STAT_H */ #endif /* HAVE_SYS_STAT_H */

1
configure generated vendored
View file

@ -22359,6 +22359,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#if defined(MAJOR_IN_MKDEV) #if defined(MAJOR_IN_MKDEV)
#include <sys/mkdev.h> #include <sys/mkdev.h>
#elif defined(MAJOR_IN_SYSMACROS) #elif defined(MAJOR_IN_SYSMACROS)
#include <sys/types.h>
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
#else #else
#include <sys/types.h> #include <sys/types.h>

1
configure.ac
View file

@ -5260,6 +5260,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#if defined(MAJOR_IN_MKDEV) #if defined(MAJOR_IN_MKDEV)
#include <sys/mkdev.h> #include <sys/mkdev.h>
#elif defined(MAJOR_IN_SYSMACROS) #elif defined(MAJOR_IN_SYSMACROS)
#include <sys/types.h>
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
#else #else
#include <sys/types.h> #include <sys/types.h>