From c5a25d56e0592817d3f8dab3eef116b8e1eb7b23 Mon Sep 17 00:00:00 2001 From: comex Date: Mon, 17 Nov 2014 13:26:10 -0500 Subject: [PATCH] Remove Android hack. There was a longstanding hack that defined ucontext_t manually to work around the lack of this header on the Android NDK. However, it looks like newer NDK versions now have it like good little POSIX boys, and my recent header reshuffle broke the build on those versions, presumably because the real and fake definitions of ucontext_t end up included in the same file where they weren't under the old organization. Rather than try to revert the conflict, this commit just removes the hack. The buildbot's NDK will need to be upgraded. --- Source/Core/Core/MachineContext.h | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/Source/Core/Core/MachineContext.h b/Source/Core/Core/MachineContext.h index 47d665b3b2..889a014755 100644 --- a/Source/Core/Core/MachineContext.h +++ b/Source/Core/Core/MachineContext.h @@ -88,20 +88,7 @@ #elif defined(__linux__) #include - #ifdef ANDROID - #include - typedef struct sigcontext mcontext_t; - typedef struct ucontext - { - uint32_t uc_flags; - struct ucontext* uc_link; - stack_t uc_stack; - mcontext_t uc_mcontext; - // ... - } ucontext_t; - #else - #include - #endif + #include typedef mcontext_t SContext; #if _M_X86_64