Author: tkreuzer
Date: Mon Nov 15 01:03:14 2010
New Revision: 49589
URL:
http://svn.reactos.org/svn/reactos?rev=49589&view=rev
Log:
[RTL]
Make asm files compilable with ML
Modified:
branches/cmake-bringup/lib/rtl/CMakeLists.txt
branches/cmake-bringup/lib/rtl/amd64/debug_asm.S
branches/cmake-bringup/lib/rtl/amd64/except_asm.S
branches/cmake-bringup/lib/rtl/amd64/rtlmem.S
branches/cmake-bringup/lib/rtl/amd64/slist.S
branches/cmake-bringup/lib/rtl/i386/debug_asm.S
branches/cmake-bringup/lib/rtl/i386/except_asm.s
branches/cmake-bringup/lib/rtl/i386/interlck.S
branches/cmake-bringup/lib/rtl/i386/res_asm.s
branches/cmake-bringup/lib/rtl/i386/rtlmem.s
Modified: branches/cmake-bringup/lib/rtl/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/CMakeList…
==============================================================================
--- branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] Mon Nov 15 01:03:14 2010
@@ -100,4 +100,4 @@
add_library(rtl ${CMAKE_CURRENT_BINARY_DIR}/rtl_rtl.h.gch ${SOURCE})
add_pch(rtl ${CMAKE_CURRENT_SOURCE_DIR}/rtl.h ${SOURCE})
-add_dependencies(rtl psdk)
+add_dependencies(rtl psdk ks386)
Modified: branches/cmake-bringup/lib/rtl/amd64/debug_asm.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/amd64/deb…
==============================================================================
--- branches/cmake-bringup/lib/rtl/amd64/debug_asm.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/rtl/amd64/debug_asm.S [iso-8859-1] Mon Nov 15 01:03:14
2010
@@ -6,7 +6,7 @@
* PROGRAMER: Timo Kreuzer (timo.kreuzer(a)reactos.org)
*/
-#include <reactos/asm.h>
+#include <asm.inc>
/* GLOBALS ****************************************************************/
Modified: branches/cmake-bringup/lib/rtl/amd64/except_asm.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/amd64/exc…
==============================================================================
--- branches/cmake-bringup/lib/rtl/amd64/except_asm.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/rtl/amd64/except_asm.S [iso-8859-1] Mon Nov 15 01:03:14
2010
@@ -8,8 +8,8 @@
/* INCLUDES ******************************************************************/
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>
/* FUNCTIONS *****************************************************************/
Modified: branches/cmake-bringup/lib/rtl/amd64/rtlmem.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/amd64/rtl…
==============================================================================
--- branches/cmake-bringup/lib/rtl/amd64/rtlmem.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/rtl/amd64/rtlmem.S [iso-8859-1] Mon Nov 15 01:03:14 2010
@@ -8,8 +8,7 @@
/* INCLUDES ******************************************************************/
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
/* FUNCTIONS *****************************************************************/
Modified: branches/cmake-bringup/lib/rtl/amd64/slist.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/amd64/sli…
==============================================================================
--- branches/cmake-bringup/lib/rtl/amd64/slist.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/rtl/amd64/slist.S [iso-8859-1] Mon Nov 15 01:03:14 2010
@@ -6,8 +6,8 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>
#define SLIST8A_DEPTH_MASK HEX(000000000000FFFF)
#define SLIST8A_DEPTH_INC HEX(0000000000000001)
Modified: branches/cmake-bringup/lib/rtl/i386/debug_asm.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/i386/debu…
==============================================================================
--- branches/cmake-bringup/lib/rtl/i386/debug_asm.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/rtl/i386/debug_asm.S [iso-8859-1] Mon Nov 15 01:03:14 2010
@@ -6,7 +6,7 @@
* PROGRAMER: Alex Ionescu (alex(a)relsoft.net)
*/
-#include <reactos/asm.h>
+#include <asm.inc>
/* GLOBALS ****************************************************************/
Modified: branches/cmake-bringup/lib/rtl/i386/except_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/i386/exce…
==============================================================================
--- branches/cmake-bringup/lib/rtl/i386/except_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/rtl/i386/except_asm.s [iso-8859-1] Mon Nov 15 01:03:14
2010
@@ -9,8 +9,8 @@
/* INCLUDES ******************************************************************/
-#include <reactos/asm.h>
-#include <ndk/asm.h>
+#include <asm.inc>
+#include <ks386.inc>
EXTERN _RtlpCheckForActiveDebugger@0:PROC
EXTERN _RtlDispatchException@8:PROC
Modified: branches/cmake-bringup/lib/rtl/i386/interlck.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/i386/inte…
==============================================================================
--- branches/cmake-bringup/lib/rtl/i386/interlck.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/rtl/i386/interlck.S [iso-8859-1] Mon Nov 15 01:03:14 2010
@@ -6,7 +6,7 @@
* PROGRAMMERS: Timo Kreuzer
*/
-#include <reactos/asm.h>
+#include <asm.inc>
/* FUNCTIONS ****************************************************************/
.code
Modified: branches/cmake-bringup/lib/rtl/i386/res_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/i386/res_…
==============================================================================
--- branches/cmake-bringup/lib/rtl/i386/res_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/rtl/i386/res_asm.s [iso-8859-1] Mon Nov 15 01:03:14 2010
@@ -1,6 +1,13 @@
+/*
+ * COPYRIGHT: GNU GPL - See COPYING in the top level directory
+ * PROJECT: ReactOS Run-Time Library
+ * PURPOSE:
+ * FILE: lib/rtl/i386/res_asm.S
+ * PROGRAMER:
+ */
-#include <reactos/asm.h>
-#include <ndk/asm.h>
+#include <asm.inc>
+#include <ks386.inc>
EXTERN _LdrpAccessResource@16:PROC
Modified: branches/cmake-bringup/lib/rtl/i386/rtlmem.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/i386/rtlm…
==============================================================================
--- branches/cmake-bringup/lib/rtl/i386/rtlmem.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/rtl/i386/rtlmem.s [iso-8859-1] Mon Nov 15 01:03:14 2010
@@ -1,12 +1,12 @@
/*
- * COPYRIGHT: See COPYING in the top level directory
+ * COPYRIGHT: GNU GPL - See COPYING in the top level directory
* PROJECT: ReactOS Run-Time Library
* PURPOSE: Memory functions
* FILE: lib/rtl/i386/rtlswap.S
* PROGRAMER: Alex Ionescu (alex.ionescu(a)reactos.org)
*/
-#include <reactos/asm.h>
+#include <asm.inc>
/* GLOBALS *******************************************************************/