Bug 4047: Support Android builds

diff --git a/compat/Makefile.am b/compat/Makefile.am
index a19bc2fe195c4639ea93e86fab472cf5945a6fef..3bdb363e92c1f9d93a80c0a6334af1e99976afba 100644 (file)
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -56,6 +56,7 @@ libcompat_squid_la_SOURCES = \
        xstrto.h \
        \
        os/aix.h \
+       os/android.h \
        os/dragonfly.h \
        os/freebsd.h \
        os/hpux.h \

diff --git a/compat/compat.h b/compat/compat.h
index a86a93dad01c99aeecdb26886ace6fb5564fdd16..dde0a5f217d6cfc39399a02e131cb0e8191dd90f 100644 (file)
--- 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 (file)
index 0000000..8dab2fe
--- /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 6d06b710459bbac5f2b6f1bacbd6eeff05ae1194..9146407e9806ec0276551261cd24300506a8ba1e 100644 (file)
--- 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