Use generic_sys_queue.h on Android.

The Android implementation of sys/queue.h is missing definitions for TAILQ_CONCAT() and LIST_FOREACH_SAFE().

Signed-off-by: Kim Topley <ktopley@apple.com>

Author: triplef

src/internal.h

@@ -277,12 +277,12 @@ upcast(dispatch_object_t dou)
 #if defined(_WIN32)
 #include <time.h>
 #else
-#include <sys/queue.h>
 #include <sys/mount.h>
 #ifdef __ANDROID__
 #include <linux/sysctl.h>
 #else
 #include <sys/sysctl.h>
+#include <sys/queue.h>
 #endif /* __ANDROID__ */
 #include <sys/socket.h>
 #include <sys/time.h>

src/shims.h

@@ -31,9 +31,12 @@
 #include <pthread.h>
 #else // defined(_WIN32)
 #include "shims/generic_win_stubs.h"
-#include "shims/generic_sys_queue.h"
 #endif // defined(_WIN32)
 
+#if defined(_WIN32) || defined(__ANDROID__)
+#include "shims/generic_sys_queue.h"
+#endif
+
 #ifdef __ANDROID__
 #include "shims/android_stubs.h"
 #endif // __ANDROID__