From 9d20a432b496ca68a9c28472dbc8473019a4943c Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Tue, 22 Apr 2014 22:09:22 -0700 Subject: [PATCH] Bug 4047: Support Android builds --- compat/Makefile.am | 1 + compat/compat.h | 1 + compat/os/android.h | 13 +++++++++++++ compat/psignal.c | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 compat/os/android.h diff --git a/compat/Makefile.am b/compat/Makefile.am index a19bc2fe19..3bdb363e92 100644 --- 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 a86a93dad0..dde0a5f217 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 -- 2.47.2