generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-24 00:49:46 +02:00
Code Issues Projects Releases Wiki Activity

fix(platform): Fixes to compile with emscripten 3.1.5 (fixes #2707) (#4318)

Browse Source 
* fix(platform): Fixes to compile with emscripten 3.1.5 on Ubuntu 22.04 #2707

* enh(Platform): add test check with emscripten on Linux
This commit is contained in:
Matej Kenda
2023-12-07 01:48:14 +01:00
committed by GitHub
parent e868ecb247
commit 35e1490b26
5 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Net/src/NetworkInterface.cpp
View File

@@ -1512,7 +1512,7 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
#include <ifaddrs.h>
#endif
#include <net/if.h>
#ifndef POCO_NO_LINUX_IF_PACKET_H
#if !defined(POCO_NO_LINUX_IF_PACKET_H) && !defined(POCO_EMSCRIPTEN)
#include <linux/if_packet.h>
#endif
#include <net/if_arp.h>
@@ -1543,7 +1543,7 @@ static NetworkInterface::Type fromNative(unsigned arphrd)
}
}
#if POCO_OS != POCO_OS_ANDROID
#if (POCO_OS != POCO_OS_ANDROID) && !defined(POCO_EMSCRIPTEN)
void setInterfaceParams(struct ifaddrs* iface, NetworkInterfaceImpl& impl)
{
@@ -1552,7 +1552,7 @@ void setInterfaceParams(struct ifaddrs* iface, NetworkInterfaceImpl& impl)
impl.setAdapterName(iface->ifa_name);
impl.setPhyParams();
#ifndef POCO_NO_LINUX_IF_PACKET_H
#if !defined(POCO_NO_LINUX_IF_PACKET_H)
if (iface->ifa_addr->sa_family == AF_PACKET)
{
struct sockaddr_ll* sdl = (struct sockaddr_ll*) iface->ifa_addr;
@@ -1602,7 +1602,7 @@ void setInterfaceParams(struct ifaddrs* iface, NetworkInterfaceImpl& impl)
NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
{
#if POCO_OS != POCO_OS_ANDROID
#if (POCO_OS != POCO_OS_ANDROID) && !defined(POCO_EMSCRIPTEN)
FastMutex::ScopedLock lock(_mutex);
Map result;
unsigned ifIndex = 0;