mirror of
https://github.com/python/cpython
synced 2024-10-14 09:31:57 +00:00
[3.12] gh-78469: Declare missing sethostname for Solaris 10 (GH-109447) (#110580)
Add OS version specific macro for Solaris: Py_SUNOS_VERSION.
(cherry picked from commit 3b1580af07
)
Co-authored-by: Jakub Kulík <Kulikjak@gmail.com>
This commit is contained in:
parent
2fc80814bf
commit
190660abe9
|
@ -5655,8 +5655,9 @@ socket_sethostname(PyObject *self, PyObject *args)
|
|||
Py_buffer buf;
|
||||
int res, flag = 0;
|
||||
|
||||
#ifdef _AIX
|
||||
/* issue #18259, not declared in any useful header file */
|
||||
#if defined(_AIX) || (defined(__sun) && defined(__SVR4) && Py_SUNOS_VERSION <= 510)
|
||||
/* issue #18259, sethostname is not declared in any useful header file on AIX
|
||||
* the same is true for Solaris 10 */
|
||||
extern int sethostname(const char *, size_t);
|
||||
#endif
|
||||
|
||||
|
|
9
configure
generated
vendored
9
configure
generated
vendored
|
@ -4304,6 +4304,15 @@ then
|
|||
darwin*) MACHDEP="darwin";;
|
||||
'') MACHDEP="unknown";;
|
||||
esac
|
||||
|
||||
if test "$ac_sys_system" = "SunOS"; then
|
||||
# For Solaris, there isn't an OS version specific macro defined
|
||||
# in most compilers, so we define one here.
|
||||
SUNOS_VERSION=`echo $ac_sys_release | sed -e 's!\.\(0-9\)$!.0\1!g' | tr -d '.'`
|
||||
|
||||
printf "%s\n" "#define Py_SUNOS_VERSION $SUNOS_VERSION" >>confdefs.h
|
||||
|
||||
fi
|
||||
fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$MACHDEP\"" >&5
|
||||
printf "%s\n" "\"$MACHDEP\"" >&6; }
|
||||
|
|
|
@ -590,6 +590,14 @@ then
|
|||
darwin*) MACHDEP="darwin";;
|
||||
'') MACHDEP="unknown";;
|
||||
esac
|
||||
|
||||
if test "$ac_sys_system" = "SunOS"; then
|
||||
# For Solaris, there isn't an OS version specific macro defined
|
||||
# in most compilers, so we define one here.
|
||||
SUNOS_VERSION=`echo $ac_sys_release | sed -e 's!\.\([0-9]\)$!.0\1!g' | tr -d '.'`
|
||||
AC_DEFINE_UNQUOTED([Py_SUNOS_VERSION], [$SUNOS_VERSION],
|
||||
[The version of SunOS/Solaris as reported by `uname -r' without the dot.])
|
||||
fi
|
||||
fi
|
||||
AC_MSG_RESULT(["$MACHDEP"])
|
||||
|
||||
|
|
|
@ -1621,6 +1621,9 @@
|
|||
/* Define if you want to enable internal statistics gathering. */
|
||||
#undef Py_STATS
|
||||
|
||||
/* The version of SunOS/Solaris as reported by `uname -r' without the dot. */
|
||||
#undef Py_SUNOS_VERSION
|
||||
|
||||
/* Define if you want to enable tracing references for debugging purpose */
|
||||
#undef Py_TRACE_REFS
|
||||
|
||||
|
|
Loading…
Reference in a new issue