diff options
| author | Memphiz <memphis@machzwo.de> | 2013-06-16 12:50:23 -0700 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2013-06-16 12:50:23 -0700 |
| commit | 051253d296d369734f1ba5ae1cfb05acdce0c3fd (patch) | |
| tree | 685b7d9a9284f06f0faf9f362618cf1776a73276 | |
| parent | 3c85e97d7b51fb88ae6f261a92c2ad8e851563c8 (diff) | |
| parent | 0f5c73c641fccc549fa14386b9254d77ea724439 (diff) | |
Merge pull request #2887 from t4-ravenbird/ios-ping
[fix][ios] ping ; timeout option not supported
| -rw-r--r-- | xbmc/network/linux/NetworkLinux.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xbmc/network/linux/NetworkLinux.cpp b/xbmc/network/linux/NetworkLinux.cpp index 7c1e0033c3..726d4e486a 100644 --- a/xbmc/network/linux/NetworkLinux.cpp +++ b/xbmc/network/linux/NetworkLinux.cpp @@ -538,7 +538,9 @@ bool CNetworkLinux::PingHost(unsigned long remote_ip, unsigned int timeout_ms) struct in_addr host_ip; host_ip.s_addr = remote_ip; -#if defined(TARGET_DARWIN) +#if defined (TARGET_DARWIN_IOS) // no timeout option available + sprintf(cmd_line, "ping -c 1 %s", inet_ntoa(host_ip)); +#elif defined (TARGET_DARWIN) sprintf(cmd_line, "ping -c 1 -t %d %s", timeout_ms / 1000 + (timeout_ms % 1000) != 0, inet_ntoa(host_ip)); #else sprintf(cmd_line, "ping -c 1 -w %d %s", timeout_ms / 1000 + (timeout_ms % 1000) != 0, inet_ntoa(host_ip)); |