Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure that HAVE_GETHOSTBYADDR is defined under Android too

Browse Source 
This is supposed to always be the same as HAVE_GETHOSTBYNAME, but
wasn't, because the latter was explicitly defined for Android after
defining the former as it.
This commit is contained in:
Vadim Zeitlin
2021-01-27 18:16:06 +01:00
parent 7d7c43c4c3
commit a3b655fd60
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/sckaddr.cpp
View File

@@ -106,11 +106,6 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress);
#endif #endif
#endif // __WINDOWS__ #endif // __WINDOWS__
// we assume that we have gethostbyaddr_r() if and only if we have
// gethostbyname_r() and that it uses the similar conventions to it (see
// comment in configure)
#define HAVE_GETHOSTBYADDR HAVE_GETHOSTBYNAME
#ifdef __ANDROID__ #ifdef __ANDROID__
#ifndef HAVE_GETHOSTBYNAME #ifndef HAVE_GETHOSTBYNAME
#define HAVE_GETHOSTBYNAME #define HAVE_GETHOSTBYNAME
@@ -125,7 +120,13 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress);
#ifdef HAVE_FUNC_GETHOSTBYNAME_R_6 #ifdef HAVE_FUNC_GETHOSTBYNAME_R_6
#define HAVE_FUNC_GETHOSTBYADDR_R_6 #define HAVE_FUNC_GETHOSTBYADDR_R_6
#endif #endif
#endif #endif // __ANDROID__/!__ANDROID__
// we assume that we have gethostbyaddr_r() if and only if we have
// gethostbyname_r() and that it uses the similar conventions to it (see
// comment in configure)
#define HAVE_GETHOSTBYADDR HAVE_GETHOSTBYNAME
// the _r functions need the extra buffer parameter but unfortunately its type // the _r functions need the extra buffer parameter but unfortunately its type
// differs between different systems and for the systems which use opaque // differs between different systems and for the systems which use opaque
// structs for it (at least AIX and OpenBSD) it must be zero-filled before // structs for it (at least AIX and OpenBSD) it must be zero-filled before