Merge pull request #32 from dschmidt/work/ucontextHEADmaster

Fix build, since c004f32a52a27b84b61ee1f454ac7337eee7d4ef ucontext is…

3 files changed, 5 insertions, 5 deletions

diff --git a/3rdparty/breakpad/client/linux/handler/exception_handler.cc b/3rdparty/breakpad/client/linux/handler/exception_handler.cc
index a772321..2db16a1 100644
--- a/3rdparty/breakpad/client/linux/handler/exception_handler.cc
+++ b/3rdparty/breakpad/client/linux/handler/exception_handler.cc
@@ -391,12 +391,12 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) {
   }
   CrashContext context;
   memcpy(&context.siginfo, info, sizeof(siginfo_t));
-  memcpy(&context.context, uc, sizeof(struct ucontext_t));
+  memcpy(&context.context, uc, sizeof(ucontext_t));
 #if !defined(__ARM_EABI__) && !defined(__mips__)
   // FP state is not part of user ABI on ARM Linux.
   // In case of MIPS Linux FP state is already part of struct ucontext
   // and 'float_state' is not a member of CrashContext.
-  struct ucontext_t *uc_ptr = (struct ucontext_t*)uc;
+  ucontext_t *uc_ptr = (ucontext_t*)uc;
   if (uc_ptr->uc_mcontext.fpregs) {
     memcpy(&context.float_state,
            uc_ptr->uc_mcontext.fpregs,
@@ -420,7 +420,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) {
   // ExceptionHandler::HandleSignal().
   siginfo.si_code = SI_USER;
   siginfo.si_pid = getpid();
-  struct ucontext_t context;
+  ucontext_t context;
   getcontext(&context);
   return HandleSignal(sig, &siginfo, &context);
 }
diff --git a/3rdparty/breakpad/client/linux/handler/exception_handler.h b/3rdparty/breakpad/client/linux/handler/exception_handler.h
index ece68d7..9b153e4 100644
--- a/3rdparty/breakpad/client/linux/handler/exception_handler.h
+++ b/3rdparty/breakpad/client/linux/handler/exception_handler.h
@@ -189,7 +189,7 @@ class ExceptionHandler {
   struct CrashContext {
     siginfo_t siginfo;
     pid_t tid;  // the crashing thread.
-    struct ucontext_t context;
+    ucontext_t context;
 #if !defined(__ARM_EABI__) && !defined(__mips__)
     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
     // In case of MIPS Linux FP state is already part of struct ucontext
diff --git a/3rdparty/breakpad/client/linux/minidump_writer/minidump_writer.cc b/3rdparty/breakpad/client/linux/minidump_writer/minidump_writer.cc
index 100dbf6..57f97d5 100644
--- a/3rdparty/breakpad/client/linux/minidump_writer/minidump_writer.cc
+++ b/3rdparty/breakpad/client/linux/minidump_writer/minidump_writer.cc
@@ -1725,7 +1725,7 @@ class MinidumpWriter {
   const int fd_;  // File descriptor where the minidum should be written.
   const char* path_;  // Path to the file where the minidum should be written.
 
-  const struct ucontext_t* const ucontext_;  // also from the signal handler
+  const ucontext_t* const ucontext_;  // also from the signal handler
   const struct _libc_fpstate* const float_state_;  // ditto
   LinuxDumper* dumper_;
   MinidumpFileWriter minidump_writer_;