diff options
| author | Victor Stinner <vstinner@python.org> | 2023-09-02 17:54:59 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-02 17:54:59 (GMT) |
| commit | 0e6d582b3b73a88e71cae04327b31a1ee203722c (patch) | |
| tree | 292ffe0376a095ef2453e7a33425b48e17793f9e | |
| parent | bac1e6d695a11cff270e663197f3cecd001fa556 (diff) | |
| download | cpython-0e6d582b3b73a88e71cae04327b31a1ee203722c.zip cpython-0e6d582b3b73a88e71cae04327b31a1ee203722c.tar.gz cpython-0e6d582b3b73a88e71cae04327b31a1ee203722c.tar.bz2 | |
gh-63760: Don't declare gethostname() on Solaris (#108817)
Since 2005, Solaris defines gethostname(). socketmodule.c no longer
has to define gethostname() for Solaris.
Oracle Solaris and OpenSolaris have patches to remove the
gethostname() definition in Python:
* https://github.com/oracle/solaris-userland/blob/master/components/python/python37/patches/15-gethostname.patch
* https://github.com/OpenIndiana/oi-userland/blob/oi/hipster/components/python/python37/patches/15-gethostname.patch
* https://github.com/omniosorg/omnios-build/blob/master/build/python27/patches/24-gethostname.patch
Co-authored-by: Jakub Kulík <Kulikjak@gmail.com>
| -rw-r--r-- | Misc/NEWS.d/next/Build/2023-09-02-18-04-15.gh-issue-63760.r8hJ6q.rst | 3 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Misc/NEWS.d/next/Build/2023-09-02-18-04-15.gh-issue-63760.r8hJ6q.rst b/Misc/NEWS.d/next/Build/2023-09-02-18-04-15.gh-issue-63760.r8hJ6q.rst new file mode 100644 index 0000000..9a7249e --- /dev/null +++ b/Misc/NEWS.d/next/Build/2023-09-02-18-04-15.gh-issue-63760.r8hJ6q.rst @@ -0,0 +1,3 @@ +Fix Solaris build: no longer redefine the ``gethostname()`` function. Solaris +defines the function since 2005. Patch by Victor Stinner, original patch by +Jakub Kulík. diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 74b1c1c..90592ff 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -111,11 +111,6 @@ Local naming conventions: #include "pycore_fileutils.h" // _Py_set_inheritable() #include "pycore_moduleobject.h" // _PyModule_GetState -// gethostname() prototype missing from Solaris standard header files -#ifdef __sun -extern int gethostname(char *, int); -#endif - #ifdef _Py_MEMORY_SANITIZER # include <sanitizer/msan_interface.h> #endif |