# HG changeset patch # User John W. Eaton # Date 1392327246 18000 # Node ID 9cfba3616503360e1c7a6a6f8ae08610add49afa # Parent 0821a51a9e1b26c81585123a93a8a4588edfa084 allow sighandlers.cc to compile on 64-bit Windows systems * sighandlers.cc (w32_interrupt_manager::do_octave_jump_to_enclosing_context): Avoid code that only works on Windows32 systems. diff -r 0821a51a9e1b -r 9cfba3616503 libinterp/corefcn/sighandlers.cc --- a/libinterp/corefcn/sighandlers.cc Thu Feb 13 11:15:58 2014 -0500 +++ b/libinterp/corefcn/sighandlers.cc Thu Feb 13 16:34:06 2014 -0500 @@ -139,6 +139,12 @@ octave_jump_to_enclosing_context_sync (); else { + // 64-bit Windows does not appear to have threadContext.Eip. + // Something else must be done here to allow interrupts to + // properly work across threads. + +#if ! (defined (__MINGW64__) || defined (_WIN64)) + CONTEXT threadContext; SuspendThread (thread); @@ -147,6 +153,7 @@ threadContext.Eip = (DWORD) octave_jump_to_enclosing_context_sync; SetThreadContext (thread, &threadContext); ResumeThread (thread); +#endif } }