From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 21 Apr 2014 08:23:37 +0000 (-0700)
Subject: Bug 4047: Support Android builds
X-Git-Tag: SQUID_3_5_0_1~281
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b7b32cdea149c96cc44a7f9382ebfd5cd1ced7e;p=thirdparty%2Fsquid.git

Bug 4047: Support Android builds
---

diff --git a/compat/compat.h b/compat/compat.h
index ee2d231af7..7845e2a259 100644
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -56,6 +56,7 @@
 /*****************************************************/
 
 #include "compat/os/aix.h"
+#include "compat/os/android.h"
 #include "compat/os/dragonfly.h"
 #include "compat/os/freebsd.h"
 #include "compat/os/hpux.h"
diff --git a/compat/os/android.h b/compat/os/android.h
new file mode 100644
index 0000000000..8dab2fe212
--- /dev/null
+++ b/compat/os/android.h
@@ -0,0 +1,13 @@
+#ifndef SQUID_OS_ANDROID_H
+#define SQUID_OS_ANDROID_H
+
+#if defined(__ANDROID__)
+/****************************************************************************
+ *--------------------------------------------------------------------------*
+ * DO *NOT* MAKE ANY CHANGES below here unless you know what you're doing...*
+ *--------------------------------------------------------------------------*
+ ****************************************************************************/
+#define _SQUID_ANDROID_ 1
+
+#endif /* _SQUID_ANDROID_ */
+#endif /* SQUID_OS_ANDROID_H */
diff --git a/compat/psignal.c b/compat/psignal.c
index 6d06b71045..9146407e98 100644
--- a/compat/psignal.c
+++ b/compat/psignal.c
@@ -5,7 +5,7 @@
 #include "squid.h"
 #include "psignal.h"
 
-#if _SQUID_AIX_ || _SQUID_MINGW_
+#if _SQUID_AIX_ || _SQUID_ANDROID_ || _SQUID_MINGW_
 extern const char* const sys_siglist[];
 #define _sys_nsig 64
 #define _sys_siglist sys_siglist