- Fix inclusion of deleted file.

svn path=/trunk/; revision=19451

diff --git a/reactos/lib/kernel32/thread/i386/fiber.S b/reactos/lib/kernel32/thread/i386/fiber.S
index 214a264..d5f93ed 100644 (file)
--- a/reactos/lib/kernel32/thread/i386/fiber.S
+++ b/reactos/lib/kernel32/thread/i386/fiber.S
@@ -7,7 +7,6 @@
  *              KJK::Hyperion <noog@libero.it>
  */
 
  *              KJK::Hyperion <noog@libero.it>
  */
 

-#include <ndk/i386/segment.h>

 #include <ndk/asm.h>
 
 #define CONTEXT_FULL                    0x10007
 #include <ndk/asm.h>
 
 #define CONTEXT_FULL                    0x10007

diff --git a/reactos/lib/ntdll/main/i386/dispatch.S b/reactos/lib/ntdll/main/i386/dispatch.S
index 289a435..ee46d0d 100644 (file)
--- a/reactos/lib/ntdll/main/i386/dispatch.S
+++ b/reactos/lib/ntdll/main/i386/dispatch.S
@@ -9,7 +9,6 @@
 /* INCLUDES ******************************************************************/\r
 \r
 #include <ndk/asm.h>\r
 /* INCLUDES ******************************************************************/\r
 \r
 #include <ndk/asm.h>\r

-#include <ndk/i386/segment.h>\r

 .intel_syntax noprefix\r
 \r
 #define EXCEPTION_NONCONTINUABLE    1\r
 .intel_syntax noprefix\r
 \r
 #define EXCEPTION_NONCONTINUABLE    1\r

diff --git a/reactos/lib/rtl/i386/except_asm.s b/reactos/lib/rtl/i386/except_asm.s
index eaa3e68..9da7d74 100644 (file)
--- a/reactos/lib/rtl/i386/except_asm.s
+++ b/reactos/lib/rtl/i386/except_asm.s
@@ -10,7 +10,6 @@
 /* INCLUDES ******************************************************************/
 
 #include <ndk/asm.h>
 /* INCLUDES ******************************************************************/
 
 #include <ndk/asm.h>

-#include <ndk/i386/segment.h>

 .intel_syntax noprefix
 
 #define EXCEPTION_UNWINDING         2
 .intel_syntax noprefix
 
 #define EXCEPTION_UNWINDING         2

diff --git a/reactos/ntoskrnl/kdbg/i386/kdb_help.S b/reactos/ntoskrnl/kdbg/i386/kdb_help.S
index 162904f..e0ae796 100644 (file)
--- a/reactos/ntoskrnl/kdbg/i386/kdb_help.S
+++ b/reactos/ntoskrnl/kdbg/i386/kdb_help.S
@@ -1,5 +1,4 @@
 #include <ndk/asm.h>
 #include <ndk/asm.h>

-#include <ndk/i386/segment.h>

 
 .text
 
 
 .text
 

diff --git a/reactos/ntoskrnl/ke/i386/ctxswitch.S b/reactos/ntoskrnl/ke/i386/ctxswitch.S
index e3d6f01..cc52db3 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/ctxswitch.S
+++ b/reactos/ntoskrnl/ke/i386/ctxswitch.S
@@ -13,7 +13,6 @@
 #include <roscfg.h>
 #include <internal/i386/ke.h>
 #include <ndk/asm.h>
 #include <roscfg.h>
 #include <internal/i386/ke.h>
 #include <ndk/asm.h>

-#include <ndk/i386/segment.h>

 .intel_syntax noprefix
 
 #define Running 2 
 .intel_syntax noprefix
 
 #define Running 2 

diff --git a/reactos/ntoskrnl/ke/i386/main_asm.S b/reactos/ntoskrnl/ke/i386/main_asm.S
index 5513da6..98f15f0 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/main_asm.S
+++ b/reactos/ntoskrnl/ke/i386/main_asm.S
@@ -1,6 +1,5 @@
 #include <roscfg.h>
 #include <ndk/asm.h>
 #include <roscfg.h>
 #include <ndk/asm.h>

-#include <ndk/i386/segment.h>

 
 #define AP_MAGIC (0x12481020)
 
 
 #define AP_MAGIC (0x12481020)
 

diff --git a/reactos/ntoskrnl/ke/i386/syscall.S b/reactos/ntoskrnl/ke/i386/syscall.S
index cb84667..3e15f03 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/syscall.S
+++ b/reactos/ntoskrnl/ke/i386/syscall.S
@@ -8,7 +8,6 @@
 #include <roscfg.h>
 #include <internal/i386/ke.h>
 #include <ndk/asm.h>
 #include <roscfg.h>
 #include <internal/i386/ke.h>
 #include <ndk/asm.h>

-#include <ndk/i386/segment.h>

 
 #define UserMode  (1)
 #define STATUS_INVALID_SYSTEM_SERVICE 0xC000001C
 
 #define UserMode  (1)
 #define STATUS_INVALID_SYSTEM_SERVICE 0xC000001C

diff --git a/reactos/ntoskrnl/ke/i386/trap.s b/reactos/ntoskrnl/ke/i386/trap.s
index 952bdbc..74fbd92 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/trap.s
+++ b/reactos/ntoskrnl/ke/i386/trap.s
@@ -11,7 +11,6 @@
 #include <roscfg.h>
 #include <ndk/asm.h>
 #include <internal/i386/ke.h>
 #include <roscfg.h>
 #include <ndk/asm.h>
 #include <internal/i386/ke.h>

-#include <ndk/i386/segment.h>

 
 #define KernelMode 0
 #define UserMode 1
 
 #define KernelMode 0
 #define UserMode 1

diff --git a/reactos/tools/nci/ncitool.c b/reactos/tools/nci/ncitool.c
index 0b62a10..4753567 100644 (file)
--- a/reactos/tools/nci/ncitool.c
+++ b/reactos/tools/nci/ncitool.c
@@ -537,8 +537,8 @@ int main(int argc, char* argv[])
     WriteFileHeader(Files[NtosKernelStubs], 
                     "System Call Stubs for Native API", 
                     argv[NtosKernelStubs + 1]);
     WriteFileHeader(Files[NtosKernelStubs], 
                     "System Call Stubs for Native API", 
                     argv[NtosKernelStubs + 1]);

-    fputs("#include <ndk/i386/segment.h>\n\n", Files[NtosKernelStubs]);
-    
+    fputs("#include <ndk/asm.h>\n\n", Files[NtosKernelStubs]);
+

     WriteFileHeader(Files[Win32kGdiStubs], 
                     "System Call Stubs for Native API", 
                     argv[Win32kGdiStubs + 1]);
     WriteFileHeader(Files[Win32kGdiStubs], 
                     "System Call Stubs for Native API", 
                     argv[Win32kGdiStubs + 1]);


@@ -546,7 +546,7 @@ int main(int argc, char* argv[])
     WriteFileHeader(Files[Win32kUserStubs], 
                     "System Call Stubs for Native API", 
                     argv[Win32kUserStubs + 1]);
     WriteFileHeader(Files[Win32kUserStubs], 
                     "System Call Stubs for Native API", 
                     argv[Win32kUserStubs + 1]);

-    
+

 
     /* Create the System Stubs */
     CreateStubs(Files[NativeSystemDb],
 
     /* Create the System Stubs */
     CreateStubs(Files[NativeSystemDb],