diff options
| author | Matthew Parlane <parlane@gmail.com> | 2014-11-21 19:56:28 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2014-11-21 19:56:28 +1300 |
| commit | 1f7dbbef0794f60f2a8998c8da5a0aeb1b2e9d7e (patch) | |
| tree | e739de4ccf705e92a57e5ed27ab9e719f4423b40 /Source/Core | |
| parent | 4ef0ab273167adf6e568ec602143f7cd0c04edae (diff) | |
| parent | c5a25d56e0592817d3f8dab3eef116b8e1eb7b23 (diff) | |
Merge pull request #1567 from comex/remove-android-ndk-hack
Remove Android <ucontext.h> hack.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/MachineContext.h | 15 |
1 files changed, 1 insertions, 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 <signal.h> - #ifdef ANDROID - #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 + #include <ucontext.h> typedef mcontext_t SContext; #if _M_X86_64 |