X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fruntime.h;h=eaa233a7f881c35f73a89f033e12ba71edc35967;hb=b841aa690bada10da8c8db6eec361e3eeef0492c;hp=9525a17a3c173029cd12b197f0d148e81434798d;hpb=584bfdc4e1093e43e4eb328a418b012745935a29;p=sbcl.git

diff --git a/src/runtime/runtime.h b/src/runtime/runtime.h
index 9525a17..eaa233a 100644
--- a/src/runtime/runtime.h
+++ b/src/runtime/runtime.h
@@ -141,7 +141,19 @@ native_pointer(lispobj obj)
 #define make_fixnum(n) ((lispobj)((n)<<N_FIXNUM_TAG_BITS))
 #define fixnum_value(n) (((long)n)>>N_FIXNUM_TAG_BITS)
 
-/* Too bad ANSI C doesn't define "bool" as C++ does.. */
+#if defined(LISP_FEATURE_WIN32)
+/* 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.  If the boolean type is only used in
+ * the runtime, and never passed to Lisp, then it doesn't matter which one
+ * we use.
+ */
+#define boolean rpcndr_boolean
+#include <shlobj.h>
+#undef boolean
+#endif
 typedef int boolean;
 
 /* This only works for static symbols. */