[ros-diffs] [tkreuzer] 46796: - include ntifs not ntddk in kddll.h - remove cxa_pure_virtual.c from mingw-lib - ewduce diff to trunk

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Fri Apr  9 20:43:27 2010
New Revision: 46796

URL: http://svn.reactos.org/svn/reactos?rev=46796&view=rev
Log:
- include ntifs not ntddk in kddll.h
- remove cxa_pure_virtual.c from mingw-lib
- ewduce diff to trunk

Removed:
    branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cxa_pure_virtual.c
Modified:
    branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h
    branches/ros-amd64-bringup/reactos/include/reactos/arc/arc.h
    branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild
    branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/mm.h

Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h?rev=46796&r1=46795&r2=46796&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h [iso-8859-1] Fri Apr  9 20:43:27 2010
@@ -9,7 +9,7 @@
 #pragma once
 
 #define NOEXTAPI
-#include <ntddk.h>
+#include <ntifs.h>
 #define NDEBUG
 #include <halfuncs.h>
 #include <stdio.h>

Modified: branches/ros-amd64-bringup/reactos/include/reactos/arc/arc.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/include/reactos/arc/arc.h?rev=46796&r1=46795&r2=46796&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/reactos/arc/arc.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/reactos/arc/arc.h [iso-8859-1] Fri Apr  9 20:43:27 2010
@@ -375,11 +375,6 @@
     ULONG VirtualBias;
 } I386_LOADER_BLOCK, *PI386_LOADER_BLOCK;
 
-typedef struct _AMD64_LOADER_BLOCK
-{
-    PVOID DbgPrint;
-} AMD64_LOADER_BLOCK, *PAMD64_LOADER_BLOCK;
-
 typedef struct _PPC_LOADER_BLOCK
 {
     PVOID BootInfo;
@@ -482,7 +477,6 @@
     union
     {
         I386_LOADER_BLOCK I386;
-        AMD64_LOADER_BLOCK Amd64;
         ALPHA_LOADER_BLOCK Alpha;
         IA64_LOADER_BLOCK IA64;
         PPC_LOADER_BLOCK PowerPC;

Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cxa_pure_virtual.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cxa_pure_virtual.c?rev=46795&view=auto
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cxa_pure_virtual.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/cxa_pure_virtual.c (removed)
@@ -1,7 +1,0 @@
-
-void _assert(int);
-
-void __cxa_pure_virtual()
-{
-    _assert(0);
-}

Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild?rev=46796&r1=46795&r2=46796&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Fri Apr  9 20:43:27 2010
@@ -2,6 +2,7 @@
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="mingw_common" type="staticlibrary" isstartuplib="true" crt="dll">
+	<library>oldnames</library>
 	<define name="_CRTBLD" />
 
 	<!-- This is to prevent from using data imports directly -->
@@ -39,7 +40,6 @@
 	<file>xthdloc.c</file>
 	<file>xtxtmode.c</file>
 	<file>ofmt_stub.c</file>
-	<file>cxa_pure_virtual.c</file>
 </module>
 <module name="mingw_main" type="staticlibrary" isstartuplib="true" crt="dll">
 	<define name="_CRTBLD" />

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/mm.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/mm.h?rev=46796&r1=46795&r2=46796&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Fri Apr  9 20:43:27 2010
@@ -87,7 +87,7 @@
 
 typedef struct _PAGE_DIRECTORY_ARM
 {
-    union
+    union 
     {
         HARDWARE_PDE_ARMV6 Pde[4096];
         HARDWARE_LARGE_PTE_ARMV6 Pte[4096];