Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

MacOSX : correct compilation issue caused by system API deprication and use of new wxWidgets.

Browse Source
This commit is contained in:
Mounir IDRASSI
2014-07-30 15:39:17 +02:00
parent 73bf608efc
commit f94707e4ef
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Main/FatalErrorHandler.cpp
View File

@@ -20,11 +20,7 @@
#endif #endif
#ifdef TC_MACOSX #ifdef TC_MACOSX
# ifdef __ppc__ # include <sys/ucontext.h>
# include <ppc/ucontext.h>
# else
# include <i386/ucontext.h>
# endif
#elif defined (TC_BSD) #elif defined (TC_BSD)
# include <ucontext.h> # include <ucontext.h>
#endif #endif
@@ -54,12 +50,10 @@ namespace VeraCrypt
# endif # endif
#elif defined (TC_MACOSX) #elif defined (TC_MACOSX)
# ifdef __ppc__ # ifdef __x86_64__
faultingInstructionAddress = context->uc_mcontext->ss.srr0; faultingInstructionAddress = context->uc_mcontext->__ss.__rip;
# elif defined (__x86_64__)
faultingInstructionAddress = context->uc_mcontext->ss.rip;
# else # else
faultingInstructionAddress = context->uc_mcontext->ss.eip; faultingInstructionAddress = context->uc_mcontext->__ss.__eip;
# endif # endif
#endif #endif

2
src/Main/Forms/MainFrame.cpp
View File

@@ -1020,7 +1020,7 @@ namespace VeraCrypt
if (!ListItemRightClickEventPending) if (!ListItemRightClickEventPending)
{ {
ListItemRightClickEventPending = true; ListItemRightClickEventPending = true;
SlotListCtrl->AddPendingEvent (event); SlotListCtrl->GetEventHandler()->AddPendingEvent (event);
return; return;
} }