smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1048 from Begasus/haiku 

Haiku
This commit is contained in:
Matthieu Gautier 2024-02-08 15:10:42 +01:00 committed by GitHub
parent 09eec822c1 b2ae1d66f5
commit e625c25ef1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/networkTools.cpp
View File

@ -43,6 +43,10 @@
#include <netdb.h> #include <netdb.h>
#endif #endif
#ifdef __HAIKU__
#include <sys/sockio.h>
#endif
size_t write_callback_to_iss(char* ptr, size_t size, size_t nmemb, void* userdata) size_t write_callback_to_iss(char* ptr, size_t size, size_t nmemb, void* userdata)
{ {
auto str = static_cast<std::stringstream*>(userdata); auto str = static_cast<std::stringstream*>(userdata);

2
test/httplib.h
View File

@ -1516,7 +1516,7 @@ inline bool bind_ip_address(socket_t sock, const char *host) {
} }
inline std::string if2ip(const std::string &ifn) { inline std::string if2ip(const std::string &ifn) {
#ifndef _WIN32 #if !defined(_WIN32) && !defined(__HAIKU__)
struct ifaddrs *ifap; struct ifaddrs *ifap;
getifaddrs(&ifap); getifaddrs(&ifap);
for (auto ifa = ifap; ifa; ifa = ifa->ifa_next) { for (auto ifa = ifap; ifa; ifa = ifa->ifa_next) {