Move some internal headers to /reactos, set it as a default include path, move pseh...

svn path=/trunk/; revision=16358

diff --git a/reactos/ReactOS.xml b/reactos/ReactOS.xml
index 1dbcd3c..421e642 100644 (file)
--- a/reactos/ReactOS.xml
+++ b/reactos/ReactOS.xml
@@ -30,8 +30,9 @@
        </if>\r
 \r
        <include>include</include>\r
+    <include>include/reactos</include>\r
        <include>w32api/include</include>\r
-       <include>w32api/include/ddk</include>\r
+    <include>w32api/include/ddk</include>\r
 \r
        <directory name="apps">\r
                <xi:include href="apps/directory.xml" />\r

diff --git a/reactos/drivers/dd/mpu401/settings.c b/reactos/drivers/dd/mpu401/settings.c
index 1c3bad1..14c5fc5 100644 (file)
--- a/reactos/drivers/dd/mpu401/settings.c
+++ b/reactos/drivers/dd/mpu401/settings.c
@@ -9,7 +9,7 @@
  *                       Sept 27, 2003: Created
  */
 
-#include <ntddk.h>
+#include <ddk/ntddk.h>
 
 #include "mpu401.h"
 

diff --git a/reactos/drivers/dd/null/null.c b/reactos/drivers/dd/null/null.c
index 3143fb4..9fcc17f 100644 (file)
--- a/reactos/drivers/dd/null/null.c
+++ b/reactos/drivers/dd/null/null.c
@@ -14,7 +14,7 @@
 /* INCLUDES */
 #include <ntddk.h>
 
-#include <pseh.h>
+#include <pseh/pseh.h>
 
 #include "null.h"
 

diff --git a/reactos/drivers/net/afd/afd/info.c b/reactos/drivers/net/afd/afd/info.c
index 6efb410..2e5929a 100644 (file)
--- a/reactos/drivers/net/afd/afd/info.c
+++ b/reactos/drivers/net/afd/afd/info.c
@@ -11,7 +11,7 @@
 #include "tdi_proto.h"
 #include "tdiconn.h"
 #include "debug.h"
-#include "pseh.h"
+#include "pseh/pseh.h"
 
 NTSTATUS STDCALL
 AfdGetInfo( PDEVICE_OBJECT DeviceObject, PIRP Irp,

diff --git a/reactos/drivers/net/afd/afd/lock.c b/reactos/drivers/net/afd/afd/lock.c
index ee4c113..83af23a 100644 (file)
--- a/reactos/drivers/net/afd/afd/lock.c
+++ b/reactos/drivers/net/afd/afd/lock.c
@@ -11,7 +11,7 @@
 #include "tdi_proto.h"
 #include "tdiconn.h"
 #include "debug.h"
-#include "pseh.h"
+#include "pseh/pseh.h"
 
 /* Lock a method_neither request so it'll be available from DISPATCH_LEVEL */
 PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ) {

diff --git a/reactos/drivers/net/afd/afd/tdi.c b/reactos/drivers/net/afd/afd/tdi.c
index c85f666..a341b31 100644 (file)
--- a/reactos/drivers/net/afd/afd/tdi.c
+++ b/reactos/drivers/net/afd/afd/tdi.c
@@ -9,7 +9,7 @@
  */
 #include <afd.h>
 #ifndef _MSC_VER
-#include <pseh.h>
+#include <pseh/pseh.h>
 #endif
 #include "debug.h"
 #include "tdiconn.h"

diff --git a/reactos/drivers/net/tcpip/tcpip/dispatch.c b/reactos/drivers/net/tcpip/tcpip/dispatch.c
index 685d45a..20204f3 100644 (file)
--- a/reactos/drivers/net/tcpip/tcpip/dispatch.c
+++ b/reactos/drivers/net/tcpip/tcpip/dispatch.c
@@ -10,7 +10,7 @@
  */
 
 #include "precomp.h"
-#include <pseh.h>
+#include <pseh/pseh.h>
 
 NTSTATUS DispPrepareIrpForCancel(
     PTRANSPORT_CONTEXT Context,

diff --git a/reactos/include/elf.h b/reactos/include/elf/elf.h
similarity index 100%
rename from reactos/include/elf.h
rename to reactos/include/elf/elf.h

diff --git a/reactos/include/pseh.h b/reactos/include/pseh/pseh.h
similarity index 100%
rename from reactos/include/pseh.h
rename to reactos/include/pseh/pseh.h

diff --git a/reactos/include/debug.h b/reactos/include/reactos/debug.h
similarity index 100%
rename from reactos/include/debug.h
rename to reactos/include/reactos/debug.h

diff --git a/reactos/lib/dbghelp/msc.c b/reactos/lib/dbghelp/msc.c
index d456b07..acebadc 100644 (file)
--- a/reactos/lib/dbghelp/msc.c
+++ b/reactos/lib/dbghelp/msc.c
@@ -52,7 +52,7 @@
 #include "winreg.h"
 #include "winternl.h"
  
-#include <pseh.h>
+#include <pseh/pseh.h>
  
 #include "wine/debug.h"
 #include "dbghelp_private.h"

diff --git a/reactos/lib/kernel32/k32.h b/reactos/lib/kernel32/k32.h
index ea85c82..f11728e 100755 (executable)
--- a/reactos/lib/kernel32/k32.h
+++ b/reactos/lib/kernel32/k32.h
@@ -28,7 +28,7 @@
 #include "include/kernel32.h"
 
 /* PSEH for SEH Support */
-#include <pseh.h>
+#include <pseh/pseh.h>
 
 /* Helper Header */
 #include <reactos/helper.h>

diff --git a/reactos/lib/psapi/precomp.h b/reactos/lib/psapi/precomp.h
index e919704..a2a53d9 100644 (file)
--- a/reactos/lib/psapi/precomp.h
+++ b/reactos/lib/psapi/precomp.h
@@ -8,4 +8,4 @@
 
 #include "internal.h"
 
-#include <pseh.h>
+#include <pseh/pseh.h>

diff --git a/reactos/lib/pseh/framebased.c b/reactos/lib/pseh/framebased.c
index 92b013f..bf95d1c 100644 (file)
--- a/reactos/lib/pseh/framebased.c
+++ b/reactos/lib/pseh/framebased.c
@@ -24,7 +24,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-#include <pseh.h>
+#include <pseh/pseh.h>
 #include <pseh/framebased/internal.h>
 #include <pseh/excpt.h>
 #include <pseh/framebased.h>

diff --git a/reactos/ntoskrnl/include/ntoskrnl.h b/reactos/ntoskrnl/include/ntoskrnl.h
index d5d3cf2..48dd676 100755 (executable)
--- a/reactos/ntoskrnl/include/ntoskrnl.h
+++ b/reactos/ntoskrnl/include/ntoskrnl.h
@@ -34,7 +34,7 @@
 #include <wchar.h>
 
 /* SEH support with PSEH */
-#include <pseh.h>
+#include <pseh/pseh.h>
 
 /* Helper Header */
 #include <reactos/helper.h>

diff --git a/reactos/ntoskrnl/mm/elf.inc.h b/reactos/ntoskrnl/mm/elf.inc.h
index 981e5e7..a15f06a 100644 (file)
--- a/reactos/ntoskrnl/mm/elf.inc.h
+++ b/reactos/ntoskrnl/mm/elf.inc.h
@@ -15,7 +15,7 @@
 #define MAXULONG ((ULONG)(~1))
 #endif
 
-#include <elf.h>
+#include <elf/elf.h>
 
 /* TODO: Intsafe should be made into a library, as it's generally useful */
 static __inline BOOLEAN Intsafe_CanAddULongPtr

diff --git a/reactos/regtests/shared/regtests.c b/reactos/regtests/shared/regtests.c
index e00376b..ecda3b1 100755 (executable)
--- a/reactos/regtests/shared/regtests.c
+++ b/reactos/regtests/shared/regtests.c
@@ -9,7 +9,7 @@
 #include <windows.h>
 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>
-#include <pseh.h>
+#include <pseh/pseh.h>
 #include "regtests.h"
 
 #define NDEBUG

diff --git a/reactos/subsys/win32k/w32k.h b/reactos/subsys/win32k/w32k.h
index 5d7b2ce..4c5f5cf 100644 (file)
--- a/reactos/subsys/win32k/w32k.h
+++ b/reactos/subsys/win32k/w32k.h
@@ -28,7 +28,7 @@ STDCALL
 MmCopyToCaller(PVOID Dest, const VOID *Src, ULONG NumberOfBytes);
 
 /* SEH Support with PSEH */
-#include <pseh.h>
+#include <pseh/pseh.h>
 
 /* CSRSS Header */
 #include <csrss/csrss.h>