Move excpt.h out of include/msvcrt/ as it does not conflict with any

standard Unix header.

dlls/kernel/computername.c

@@ -38,7 +38,7 @@
 #include "winternl.h"
 #include "wine/unicode.h"
 #include "wine/exception.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 #include "wine/debug.h"
 #include "file.h"
 

dlls/kernel/console.c

@@ -46,7 +46,7 @@
 #include "wine/exception.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 #include "console_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(console);

dlls/msvcrt/cppexcept.c

@@ -29,7 +29,7 @@
 #include "winternl.h"
 #include "msvcrt.h"
 #include "wine/exception.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(seh);

dlls/msvcrt/except.c

@@ -34,7 +34,7 @@
 #include "msvcrt.h"
 
 #include "msvcrt/setjmp.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 
 
 #include "wine/debug.h"

dlls/ntdll/debugtools.c

@@ -41,7 +41,7 @@
 #include "winbase.h"
 #include "winnt.h"
 #include "winternl.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 
 WINE_DECLARE_DEBUG_CHANNEL(tid);
 

dlls/ntdll/exception.c

@@ -33,7 +33,7 @@
 #include "miscemu.h"
 #include "wine/server.h"
 #include "wine/debug.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(seh);
 

dlls/ntdll/loader.c

@@ -22,7 +22,7 @@
 
 #include "module.h"
 #include "wine/exception.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ntdll);

dlls/ntdll/sec.c

@@ -42,7 +42,7 @@
 #include "winternl.h"
 #include "winreg.h"
 #include "ntdll_misc.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
 

dlls/user/lstr.c

@@ -36,7 +36,7 @@
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 
 #include "wine/debug.h"
 

dlls/winedos/dosvm.c

@@ -52,7 +52,7 @@
 #include "dosvm.h"
 #include "stackframe.h"
 #include "wine/debug.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(int);
 WINE_DECLARE_DEBUG_CHANNEL(module);

dlls/wininet/internet.c

@@ -54,7 +54,7 @@
 #include "shlwapi.h"
 
 #include "wine/exception.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 
 #include "internet.h"
 

files/dos_fs.c

@@ -52,7 +52,7 @@
 #include "msdos.h"
 #include "winternl.h"
 #include "wine/server.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 
 #include "smb.h"
 

include/Makefile.in

@@ -43,6 +43,7 @@ WINDOWS_INCLUDES = \
 	dsdriver.h \
 	dshow.h \
 	dsound.h \
+	excpt.h \
 	fci.h \
 	fdi.h \
 	guiddef.h \
@@ -170,7 +171,6 @@ MSVCRT_INCLUDES = \
 	msvcrt/dos.h \
 	msvcrt/eh.h \
 	msvcrt/errno.h \
-	msvcrt/excpt.h \
 	msvcrt/fcntl.h \
 	msvcrt/io.h \
 	msvcrt/locale.h \

include/windows.h

@@ -33,7 +33,7 @@
 #else /* RC_INVOKED && !NOWINRES */
 
 /* All the basic includes */
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

loader/ne/module.c

@@ -42,7 +42,7 @@
 #include "snoop.h"
 #include "builtin16.h"
 #include "stackframe.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 #include "wine/exception.h"
 #include "wine/debug.h"
 

loader/resource.c

@@ -42,7 +42,7 @@
 #include "wine/debug.h"
 #include "winerror.h"
 #include "winnls.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(resource);
 

memory/global.c

@@ -47,7 +47,7 @@
 #include "module.h"
 #include "wine/debug.h"
 #include "winerror.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(global);
 

memory/string.c

@@ -29,7 +29,7 @@
 #include "wine/unicode.h"
 #include "winerror.h"
 #include "winnls.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(string);

memory/virtual.c

@@ -34,7 +34,7 @@
 #include "winternl.h"
 #include "winerror.h"
 #include "wine/exception.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(virtual);

programs/winedbg/dbg.y

@@ -32,7 +32,7 @@
 #include "wine/exception.h"
 #include "debugger.h"
 #include "expr.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 
 static void mode_command(int);
 int yylex(void);

programs/winedbg/winedbg.c

@@ -31,7 +31,7 @@
 #include "winreg.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 #include "wine/library.h"
 
 DBG_PROCESS*	DEBUG_CurrProcess = NULL;

relay32/snoop.c

@@ -31,7 +31,7 @@
 #include "stackframe.h"
 #include "wine/debug.h"
 #include "wine/exception.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(snoop);
 

win32/except.c

@@ -48,7 +48,7 @@
 #include "wine/library.h"
 #include "thread.h"
 #include "stackframe.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 #include "wine/server.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"

windows/cursoricon.c

@@ -59,7 +59,7 @@
 #include "user.h"
 #include "message.h"
 #include "winerror.h"
-#include "msvcrt/excpt.h"
+#include "excpt.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(cursor);
 WINE_DECLARE_DEBUG_CHANNEL(icon);