From 0e450718cdb0440a70789d9e890f06684f64b2bd Mon Sep 17 00:00:00 2001
From: Aleksey Bragin <aleksey@reactos.org>
Date: Tue, 7 Aug 2007 20:46:24 +0000
Subject: [PATCH] - Rename exception.c to except.c to avoid conflict with
 another exception.c in rtl project. - Fix WDK compatibility.

svn path=/trunk/; revision=28223
---
 reactos/lib/rtl/i386/{exception.c => except.c} | 0
 reactos/lib/rtl/rtl.h                          | 6 +++++-
 reactos/lib/rtl/rtl.rbuild                     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
 rename reactos/lib/rtl/i386/{exception.c => except.c} (100%)

diff --git a/reactos/lib/rtl/i386/exception.c b/reactos/lib/rtl/i386/except.c
similarity index 100%
rename from reactos/lib/rtl/i386/exception.c
rename to reactos/lib/rtl/i386/except.c
diff --git a/reactos/lib/rtl/rtl.h b/reactos/lib/rtl/rtl.h
index cdb76dfe364..a557d834621 100644
--- a/reactos/lib/rtl/rtl.h
+++ b/reactos/lib/rtl/rtl.h
@@ -24,11 +24,15 @@
 #include <ndk/ntndk.h>
 
 /* Internal RTL header */
-#include <reactos/helper.h>
 #include "rtlp.h"
 
+/* PSEH Support */
+#include <reactos/helper.h>
 #include <pseh/pseh.h>
+
+#ifndef _MSC_VER
 #include <intrin.h>
+#endif
 
 #endif /* RTL_H */
 
diff --git a/reactos/lib/rtl/rtl.rbuild b/reactos/lib/rtl/rtl.rbuild
index 68febbc5edc..ce69b56a61d 100644
--- a/reactos/lib/rtl/rtl.rbuild
+++ b/reactos/lib/rtl/rtl.rbuild
@@ -10,7 +10,7 @@
         <directory name="i386">
             <file>debug_asm.S</file>
             <file>except_asm.s</file>
-            <file>exception.c</file>
+            <file>except.c</file>
             <file>random_asm.S</file>
             <file>rtlswap.S</file>
             <file>rtlmem.s</file>