From 737d4be8920395c1f2a9e32a3b0f17c4365cd09e Mon Sep 17 00:00:00 2001
From: "Dimitrie O. Paun" <dpaun@rogers.com>
Date: Thu, 12 Dec 2002 23:34:01 +0000
Subject: [PATCH] Move excpt.h out of include/msvcrt/ as it does not conflict
 with any standard Unix header.

---
 dlls/kernel/computername.c   | 2 +-
 dlls/kernel/console.c        | 2 +-
 dlls/msvcrt/cppexcept.c      | 2 +-
 dlls/msvcrt/except.c         | 2 +-
 dlls/ntdll/debugtools.c      | 2 +-
 dlls/ntdll/exception.c       | 2 +-
 dlls/ntdll/loader.c          | 2 +-
 dlls/ntdll/sec.c             | 2 +-
 dlls/user/lstr.c             | 2 +-
 dlls/winedos/dosvm.c         | 2 +-
 dlls/wininet/internet.c      | 2 +-
 files/dos_fs.c               | 2 +-
 include/Makefile.in          | 2 +-
 include/{msvcrt => }/excpt.h | 0
 include/windows.h            | 2 +-
 loader/ne/module.c           | 2 +-
 loader/resource.c            | 2 +-
 memory/global.c              | 2 +-
 memory/string.c              | 2 +-
 memory/virtual.c             | 2 +-
 programs/winedbg/dbg.y       | 2 +-
 programs/winedbg/winedbg.c   | 2 +-
 relay32/snoop.c              | 2 +-
 win32/except.c               | 2 +-
 windows/cursoricon.c         | 2 +-
 25 files changed, 24 insertions(+), 24 deletions(-)
 rename include/{msvcrt => }/excpt.h (100%)

diff --git a/dlls/kernel/computername.c b/dlls/kernel/computername.c
index 1caef93426..74a66cd775 100644
--- a/dlls/kernel/computername.c
+++ b/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"
 
diff --git a/dlls/kernel/console.c b/dlls/kernel/console.c
index 934476b7a2..3725e74884 100644
--- a/dlls/kernel/console.c
+++ b/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);
diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c
index 23075cc4d2..851e5f1a0a 100644
--- a/dlls/msvcrt/cppexcept.c
+++ b/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);
diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c
index cbca76677f..56adaf8c95 100644
--- a/dlls/msvcrt/except.c
+++ b/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"
diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c
index ca34cfbc6a..f309d33efa 100644
--- a/dlls/ntdll/debugtools.c
+++ b/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);
 
diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index 5a9d859773..048a398f0f 100644
--- a/dlls/ntdll/exception.c
+++ b/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);
 
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 5d04cda7e5..26cfcce59c 100644
--- a/dlls/ntdll/loader.c
+++ b/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);
diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
index 9b5f555090..12b68d100c 100644
--- a/dlls/ntdll/sec.c
+++ b/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);
 
diff --git a/dlls/user/lstr.c b/dlls/user/lstr.c
index 5a9d03c8d6..329cd4d4cb 100644
--- a/dlls/user/lstr.c
+++ b/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"
 
diff --git a/dlls/winedos/dosvm.c b/dlls/winedos/dosvm.c
index 46524d2b31..3980c157eb 100644
--- a/dlls/winedos/dosvm.c
+++ b/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);
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index c3c1758153..2be5f762be 100644
--- a/dlls/wininet/internet.c
+++ b/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"
 
diff --git a/files/dos_fs.c b/files/dos_fs.c
index 73207a2973..07061d79c1 100644
--- a/files/dos_fs.c
+++ b/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"
 
diff --git a/include/Makefile.in b/include/Makefile.in
index 7ba644b9c6..b7e3ca669a 100644
--- a/include/Makefile.in
+++ b/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 \
diff --git a/include/msvcrt/excpt.h b/include/excpt.h
similarity index 100%
rename from include/msvcrt/excpt.h
rename to include/excpt.h
diff --git a/include/windows.h b/include/windows.h
index fc264c0181..4862c1eed7 100644
--- a/include/windows.h
+++ b/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"
diff --git a/loader/ne/module.c b/loader/ne/module.c
index 1b705e3b36..8d01f5b124 100644
--- a/loader/ne/module.c
+++ b/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"
 
diff --git a/loader/resource.c b/loader/resource.c
index 27daad70d2..07ab9d5ed9 100644
--- a/loader/resource.c
+++ b/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);
 
diff --git a/memory/global.c b/memory/global.c
index deab646a27..b6f317c3db 100644
--- a/memory/global.c
+++ b/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);
 
diff --git a/memory/string.c b/memory/string.c
index 0d756dc132..0466aa04c5 100644
--- a/memory/string.c
+++ b/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);
diff --git a/memory/virtual.c b/memory/virtual.c
index 38180d5205..2519bb5c8e 100644
--- a/memory/virtual.c
+++ b/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);
diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y
index 5345070931..078ecc1f1e 100644
--- a/programs/winedbg/dbg.y
+++ b/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);
diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c
index 9a5db3b797..3d0c0749df 100644
--- a/programs/winedbg/winedbg.c
+++ b/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;
diff --git a/relay32/snoop.c b/relay32/snoop.c
index 4070c1a332..b7007f7bf3 100644
--- a/relay32/snoop.c
+++ b/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);
 
diff --git a/win32/except.c b/win32/except.c
index cd6293e7cc..a785cc2cc4 100644
--- a/win32/except.c
+++ b/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"
diff --git a/windows/cursoricon.c b/windows/cursoricon.c
index d6b202b502..ca8abd27e0 100644
--- a/windows/cursoricon.c
+++ b/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);
-- 
2.32.0.93.g670b81a890