From 516fd388674362c6fb2de59340b85f3d92ea32d8 Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@google.com>
Date: Wed, 11 Jul 2012 18:07:43 +0200
Subject: Forward-compatible fix for ucontext_t

The Android C library <signal.h> will soon be modified to declare
ucontext_t in <signal.h>. To avoid conflicts when this happens, only
define the type when needed.

See b/issue?id=2189142

Change-Id: I297b8e6f9fba8fb99c5f799b0d7e7f4dbda914bb
---
 base/process_util_posix.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc
index 3270079..a741892 100644
--- a/base/process_util_posix.cc
+++ b/base/process_util_posix.cc
@@ -39,8 +39,8 @@
 extern char** environ;
 #endif
 
-#ifdef ANDROID
-// No ucontext.h on Android
+#if defined(__ANDROID__) && !defined(__BIONIC_HAVE_UCONTEXT_T)
+// No ucontext.h on old Android C library headers
 typedef void ucontext_t;
 #endif
 
-- 
cgit v1.1