piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove Android <ucontext.h> hack.

Browse Source 
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.
This commit is contained in:
comex 2014-11-17 13:26:10 -05:00
parent aa2fc1f66b
commit c5a25d56e0
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/Core/MachineContext.h
View File

@ -88,20 +88,7 @@
#elif defined(__linux__) #elif defined(__linux__)
#include <signal.h> #include <signal.h>
#ifdef ANDROID #include <ucontext.h>
#include <asm/sigcontext.h>
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 <ucontext.h>
#endif
typedef mcontext_t SContext; typedef mcontext_t SContext;
#if _M_X86_64 #if _M_X86_64