Merge branch 'master' of git://factorcode.org/git/factor

diff --git a/basis/debugger/windows/windows.factor b/basis/debugger/windows/windows.factor
index 0de5c38283a544edc41b66354d83335982abef23..319f100e160bd4f3ab8dd0778d74ff1c4152fd19 100755 (executable)
--- a/basis/debugger/windows/windows.factor
+++ b/basis/debugger/windows/windows.factor
@@ -30,6 +30,8 @@ CONSTANT: seh-names
         { $ STATUS_PRIVILEGED_INSTRUCTION     "STATUS_PRIVILEGED_INSTRUCTION"   }
         { $ STATUS_STACK_OVERFLOW             "STATUS_STACK_OVERFLOW"           }
         { $ STATUS_CONTROL_C_EXIT             "STATUS_CONTROL_C_EXIT"           }
+        { $ STATUS_FLOAT_MULTIPLE_FAULTS      "STATUS_FLOAT_MULTIPLE_FAULTS"    }
+        { $ STATUS_FLOAT_MULTIPLE_TRAPS       "STATUS_FLOAT_MULTIPLE_TRAPS"     }
     }
 
 : seh-name. ( n -- )

diff --git a/basis/windows/kernel32/kernel32.factor b/basis/windows/kernel32/kernel32.factor
index 4cf93f78364270dee11723bba74ff448da3250b9..54d3fe6f4d2dda6f1cfd5c6ed0a6a1ce30b94628 100755 (executable)
--- a/basis/windows/kernel32/kernel32.factor
+++ b/basis/windows/kernel32/kernel32.factor
@@ -784,6 +784,8 @@ CONSTANT: STATUS_INTEGER_OVERFLOW           HEX: C0000095
 CONSTANT: STATUS_PRIVILEGED_INSTRUCTION     HEX: C0000096
 CONSTANT: STATUS_STACK_OVERFLOW             HEX: C00000FD
 CONSTANT: STATUS_CONTROL_C_EXIT             HEX: C000013A
+CONSTANT: STATUS_FLOAT_MULTIPLE_FAULTS      HEX: C00002B4
+CONSTANT: STATUS_FLOAT_MULTIPLE_TRAPS       HEX: C00002B5
 
 LIBRARY: kernel32
 ! FUNCTION: _hread