- Rename exception.c to except.c to avoid conflict with another exception.c in rtl...

- Fix WDK compatibility.

svn path=/trunk/; revision=28223

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 cdb76df..a557d83 100644 (file)
--- 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 68febbc..ce69b56 100644 (file)
--- 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>