From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 4 Jun 2025 13:16:39 +0000 (+0200)
Subject: [3.14] gh-135108: Fix utmp.h inclusion in posixmodule.c on NetBSD (GH-135109) (GH... 
X-Git-Tag: v3.14.0b3~94
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=afe244d694e5995628765e158c1c65705c177a1b;p=thirdparty%2FPython%2Fcpython.git

[3.14] gh-135108: Fix utmp.h inclusion in posixmodule.c on NetBSD (GH-135109) (GH-135127)

(cherry picked from commit 5b3865418ceb1448bfbf15cddf52c900cd5882a3)

Co-authored-by: Furkan Onder <furkanonder@protonmail.com>
---

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 03ab8dbdfb1e..6e219271ae9e 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -8806,14 +8806,14 @@ os_ptsname_impl(PyObject *module, int fd)
 #if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) || defined(HAVE_LOGIN_TTY) || defined(HAVE_DEV_PTMX)
 #ifdef HAVE_PTY_H
 #include <pty.h>
-#ifdef HAVE_UTMP_H
-#include <utmp.h>
-#endif /* HAVE_UTMP_H */
 #elif defined(HAVE_LIBUTIL_H)
 #include <libutil.h>
 #elif defined(HAVE_UTIL_H)
 #include <util.h>
 #endif /* HAVE_PTY_H */
+#ifdef HAVE_UTMP_H
+#include <utmp.h>
+#endif /* HAVE_UTMP_H */
 #ifdef HAVE_STROPTS_H
 #include <stropts.h>
 #endif