nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-11-24 03:53:29 +01:00
Code Issues Packages Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Main/FatalErrorHandler.cpp
View File

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

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

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