X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fwin32-os.c;h=b0e9b6faa6741c4bdb1f8a52b188eee7a428cafd;hb=fc31bc13de8f252311185aa728acbbb7f73d64fb;hp=394ed3eb2fe448ee51bd871aaba91248e11c76ad;hpb=5661b3a7644f46f621fda62568aba2f3c9677317;p=sbcl.git

diff --git a/src/runtime/win32-os.c b/src/runtime/win32-os.c
index 394ed3e..b0e9b6f 100644
--- a/src/runtime/win32-os.c
+++ b/src/runtime/win32-os.c
@@ -51,16 +51,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-/* KLUDGE: Avoid double definition of boolean by rpcndr.h included via
- * shlobj.h.
- *
- * FIXME: We should probably arrange to use the rpcndr.h boolean on Windows,
- * or get rid of our own boolean type.
- */
-#define boolean rpcndr_boolean
-#include <shlobj.h>
-#undef boolean
-
 #include <math.h>
 #include <float.h>
 
@@ -341,7 +331,7 @@ handle_exception(EXCEPTION_RECORD *exception_record,
     }
 
     if (exception_record->ExceptionCode == EXCEPTION_BREAKPOINT) {
-	unsigned char trap;
+        unsigned char trap;
         /* This is just for info in case the monitor wants to print an
          * approximation. */
         current_control_stack_pointer =
@@ -428,7 +418,7 @@ handle_exception(EXCEPTION_RECORD *exception_record,
         _clearfp();
 
         /* Call into lisp to handle things. */
-        funcall2(SymbolFunction(HANDLE_WIN32_EXCEPTION), context_sap,
+        funcall2(StaticSymbolFunction(HANDLE_WIN32_EXCEPTION), context_sap,
                  exception_record_sap);
 
         /* If Lisp doesn't nlx, we need to put things back. */