Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

check for getaddrinfo() during build

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2020-11-16 23:34:16 +02:00
parent cf120d91c2
commit df852837c3
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -363,6 +363,7 @@ katie_check_function(getpwnam_r "pwd.h")
katie_check_function(getpwuid_r "pwd.h")
katie_check_function(getgrgid_r "grp.h")
katie_check_function(nl_langinfo "langinfo.h")
katie_check_function(getaddrinfo "netdb.h")
# XSI/POSIX.1-2001
katie_check_function(strerror_r "string.h")
# SUSv2

1
src/core/global/qconfig.h.cmake
View file

@ -187,7 +187,6 @@
#cmakedefine QT_NO_FTP
#cmakedefine QT_NO_GEOM_VARIANT
#cmakedefine QT_NO_GESTURES
#cmakedefine QT_NO_GETADDRINFO
#cmakedefine QT_NO_GRAPHICSEFFECT
#cmakedefine QT_NO_GRAPHICSSVGITEM
#cmakedefine QT_NO_GRAPHICSVIEW

10
src/network/kernel/qhostinfo_unix.cpp
View file

@ -53,7 +53,7 @@
QT_BEGIN_NAMESPACE
#if defined (QT_NO_GETADDRINFO)
#if !defined(QT_HAVE_GETADDRINFO)
#include "qmutex.h"
Q_GLOBAL_STATIC(QMutex, getHostByNameMutex)
#endif
@ -75,7 +75,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
QHostAddress address;
if (address.setAddress(hostName)) {
// Reverse lookup
#if !defined (QT_NO_GETADDRINFO)
#if defined(QT_HAVE_GETADDRINFO)
sockaddr_in sa4;
#ifndef QT_NO_IPV6
sockaddr_in6 sa6;
@ -146,7 +146,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
return results;
}
#if !defined (QT_NO_GETADDRINFO)
#if defined(QT_HAVE_GETADDRINFO)
// Call getaddrinfo, and place all IPv4 addresses at the start and
// the IPv6 addresses at the end of the address list in results.
addrinfo *res = 0;
@ -244,7 +244,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
results.setError(QHostInfo::UnknownError);
results.setErrorString(tr("Unknown error"));
}
#endif // !defined (QT_NO_GETADDRINFO)
#endif // defined(QT_HAVE_GETADDRINFO)
#if defined(QHOSTINFO_DEBUG)
if (results.error() != QHostInfo::NoError) {
@ -294,7 +294,7 @@ QString QHostInfo::localDomainName()
#elif !defined(QT_NO_RESOLV)
// using thread-unsafe version
#if defined(QT_NO_GETADDRINFO)
#if !defined(QT_HAVE_GETADDRINFO)
// We have to call res_init to be sure that _res was initialized
// So, for systems without getaddrinfo (which is thread-safe), we lock the mutex too
QMutexLocker locker(getHostByNameMutex());