Mercurial > octave-nkf

changeset 18471:b2a2f097c5e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge gui-release to default.
author Rik <rik@octave.org>
date Sat, 15 Feb 2014 20:19:42 -0800
parents 0bfa7798c496 (current diff) 044bbf569cd3 (diff)
children 16b0cd465ecd
files libinterp/parse-tree/lex.ll
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/sighandlers.cc	Sat Feb 15 20:09:32 2014 -0800
+++ b/libinterp/corefcn/sighandlers.cc	Sat Feb 15 20:19:42 2014 -0800
@@ -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
       }
   }
 
--- a/libinterp/parse-tree/lex.ll	Sat Feb 15 20:09:32 2014 -0800
+++ b/libinterp/parse-tree/lex.ll	Sat Feb 15 20:19:42 2014 -0800
@@ -461,7 +461,7 @@
 %}
 
 <COMMAND_START>([\.]|[^#% \t\r\n\.\,\;\"\'\(\[\{\}\]\)]*) {
-    curr_lexer->lexer_debug ("<COMMAND_START>([\.]|[^#% \\t\\r\n\\.\\,\\;\\\"\\'\\(\\[\\{\\}\\]\\)]*");
+    curr_lexer->lexer_debug ("<COMMAND_START>([\\.]|[^#% \\t\\r\\n\\.\\,\\;\\\"\\'\\(\\[\\{\\}\\]\\)]*");
 
     curr_lexer->string_text += yytext;
     curr_lexer->current_input_column += yyleng;