Index: /trunk/source/lisp-kernel/platform-win32.h
===================================================================
--- /trunk/source/lisp-kernel/platform-win32.h	(revision 13641)
+++ /trunk/source/lisp-kernel/platform-win32.h	(revision 13642)
@@ -41,15 +41,11 @@
 #define xpMXCSRptr(x) (DWORD *)(&(x->ExtendedRegisters[24]))
 
-#ifdef SOLARIS
-#define SIGNUM_FOR_INTN_TRAP SIGSEGV
-#ifdef X8664
-#define IS_MAYBE_INT_TRAP(info,xp) ((xpGPR(xp,REG_TRAPNO)==0xd)&&((xpGPR(xp,REG_ERR)&7)==2))
-#define IS_PAGE_FAULT(info,xp) (xpGPR(xp,REG_TRAPNO)==0xe)
-#else
-#define IS_MAYBE_INT_TRAP(info,xp) ((xpGPR(xp,TRAPNO)==0xd)&&((xpGPR(xp,ERR)&7)==2))
-#define IS_PAGE_FAULT(info,xp) (xpGPR(xp,TRAPNO)==0xe)
-#endif
-#define SIGRETURN(context) setcontext(context)
-#endif
+#define SIGNUM_FOR_INTN_TRAP SIGSEGV /* Also fake */
+#define IS_MAYBE_INT_TRAP(info,xp) \
+  ((info->ExceptionCode == EXCEPTION_ACCESS_VIOLATION) &&       \
+   (info->ExceptionInformation[0]==0) &&                       \
+   (info->ExceptionInformation[1]==(ULONG_PTR)(-1L)))
+#define IS_PAGE_FAULT(info,xp) (1)
+#define SIGRETURN(context)      /* for now */
 
 #include "os-windows.h"
Index: /trunk/source/lisp-kernel/win32/Makefile
===================================================================
--- /trunk/source/lisp-kernel/win32/Makefile	(revision 13641)
+++ /trunk/source/lisp-kernel/win32/Makefile	(revision 13642)
@@ -75,5 +75,5 @@
 	lisp-exceptions.h lisp_globals.h macros.h memprotect.h image.h \
 	Threads.h x86-constants32.h x86-exceptions.h lisptypes.h \
-	$(PLATFORM_H) constsnts.h os-windows.h
+	$(PLATFORM_H) constants.h os-windows.h