Modify conditional to have Android API version check (#526)

camm73 · web-flow · commit 00619e0500f4 · 2024-02-20T15:12:00.000-08:00
Co-authored-by: Cameron Miller &lt;cameron.miller@homeaware.com&gt;
diff --git a/src/network_interface.cpp b/src/network_interface.cpp
@@ -331,7 +331,7 @@ NetworkInterface::Info NetworkInterface::info() const {
     }
 
     #else // _WIN32
-    #ifndef ANDROID 
+    #if !defined(ANDROID) || (defined(__ANDROID_API__) && __ANDROID_API__ >= 24)
     struct ifaddrs* ifaddrs = 0;
     struct ifaddrs* if_it = 0;
     getifaddrs(&ifaddrs);
diff --git a/src/utils/routing_utils.cpp b/src/utils/routing_utils.cpp
@@ -413,7 +413,7 @@ set<string> network_interfaces() {
 }
 #else
 set<string> network_interfaces() {
-    #ifndef ANDROID 
+    #if !defined(ANDROID) || (defined(__ANDROID_API__) && __ANDROID_API__ >= 24)
         set<string> output;
         struct ifaddrs* ifaddrs = 0;
         struct ifaddrs* if_it = 0;

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ NetworkInterface::Info NetworkInterface::info() const {`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`#else // _WIN32`
`334`		`- #ifndef ANDROID`
	`334`	`+ #if !defined(ANDROID) \|\| (defined(__ANDROID_API__) && __ANDROID_API__ >= 24)`
`335`	`335`	`struct ifaddrs* ifaddrs = 0;`
`336`	`336`	`struct ifaddrs* if_it = 0;`
`337`	`337`	`getifaddrs(&ifaddrs);`
Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ set<string> network_interfaces() {`
`413`	`413`	`}`
`414`	`414`	`#else`
`415`	`415`	`set<string> network_interfaces() {`
`416`		`- #ifndef ANDROID`
	`416`	`+ #if !defined(ANDROID) \|\| (defined(__ANDROID_API__) && __ANDROID_API__ >= 24)`
`417`	`417`	`set<string> output;`
`418`	`418`	`struct ifaddrs* ifaddrs = 0;`
`419`	`419`	`struct ifaddrs* if_it = 0;`