------------------------------------------------------------
revno: 13124
revision-id: squid3@treenet.co.nz-20140423050922-3a28qb0gbb3wcz0g
parent: squid3@treenet.co.nz-20140423050652-f8cv02mqh23m0emk
fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=4047
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Tue 2014-04-22 22:09:22 -0700
message:
  Bug 4047: Support Android builds
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140423050922-3a28qb0gbb3wcz0g
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: 655def6c54b670f0347cfe1231aaa16cc3ba8db1
# timestamp: 2014-04-23 05:14:32 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20140423050652-\
#   f8cv02mqh23m0emk
# 
# Begin patch
=== modified file 'compat/Makefile.am'
--- compat/Makefile.am	2014-03-21 08:47:02 +0000
+++ compat/Makefile.am	2014-04-23 05:09:22 +0000
@@ -56,6 +56,7 @@
 	xstrto.h \
 	\
 	os/aix.h \
+	os/android.h \
 	os/dragonfly.h \
 	os/freebsd.h \
 	os/hpux.h \

=== modified file 'compat/compat.h'
--- compat/compat.h	2014-02-18 08:43:02 +0000
+++ compat/compat.h	2014-04-23 05:09:22 +0000
@@ -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"

=== added file 'compat/os/android.h'
--- compat/os/android.h	1970-01-01 00:00:00 +0000
+++ compat/os/android.h	2014-04-23 05:09:22 +0000
@@ -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 */

=== modified file 'compat/psignal.c'
--- compat/psignal.c	2012-01-20 18:55:04 +0000
+++ compat/psignal.c	2014-04-23 05:09:22 +0000
@@ -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