From 07652e2631d8364c05e250f8dd99ab32bb8d79e2 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Mon, 15 Nov 2010 01:03:14 +0000 Subject: [PATCH] [RTL] Make asm files compilable with ML svn path=/branches/cmake-bringup/; revision=49589 --- lib/rtl/CMakeLists.txt | 2 +- lib/rtl/amd64/debug_asm.S | 2 +- lib/rtl/amd64/except_asm.S | 4 ++-- lib/rtl/amd64/rtlmem.S | 3 +-- lib/rtl/amd64/slist.S | 4 ++-- lib/rtl/i386/debug_asm.S | 2 +- lib/rtl/i386/except_asm.s | 4 ++-- lib/rtl/i386/interlck.S | 2 +- lib/rtl/i386/res_asm.s | 11 +++++++++-- lib/rtl/i386/rtlmem.s | 4 ++-- 10 files changed, 22 insertions(+), 16 deletions(-) diff --git a/lib/rtl/CMakeLists.txt b/lib/rtl/CMakeLists.txt index 17e7925f689..f34de65b8b3 100644 --- a/lib/rtl/CMakeLists.txt +++ b/lib/rtl/CMakeLists.txt @@ -100,4 +100,4 @@ endif(ARCH MATCHES i386) 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) diff --git a/lib/rtl/amd64/debug_asm.S b/lib/rtl/amd64/debug_asm.S index c115feb12fc..ca09236c566 100644 --- a/lib/rtl/amd64/debug_asm.S +++ b/lib/rtl/amd64/debug_asm.S @@ -6,7 +6,7 @@ * PROGRAMER: Timo Kreuzer (timo.kreuzer@reactos.org) */ -#include +#include /* GLOBALS ****************************************************************/ diff --git a/lib/rtl/amd64/except_asm.S b/lib/rtl/amd64/except_asm.S index a4b35079fcd..54f44ce445a 100644 --- a/lib/rtl/amd64/except_asm.S +++ b/lib/rtl/amd64/except_asm.S @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include +#include /* FUNCTIONS *****************************************************************/ diff --git a/lib/rtl/amd64/rtlmem.S b/lib/rtl/amd64/rtlmem.S index d0a82068251..e75161061ee 100644 --- a/lib/rtl/amd64/rtlmem.S +++ b/lib/rtl/amd64/rtlmem.S @@ -8,8 +8,7 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include /* FUNCTIONS *****************************************************************/ diff --git a/lib/rtl/amd64/slist.S b/lib/rtl/amd64/slist.S index ca1ed3905d5..efdada51999 100644 --- a/lib/rtl/amd64/slist.S +++ b/lib/rtl/amd64/slist.S @@ -6,8 +6,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include -#include +#include +#include #define SLIST8A_DEPTH_MASK HEX(000000000000FFFF) #define SLIST8A_DEPTH_INC HEX(0000000000000001) diff --git a/lib/rtl/i386/debug_asm.S b/lib/rtl/i386/debug_asm.S index a6cdfe1028b..39b6fa84236 100644 --- a/lib/rtl/i386/debug_asm.S +++ b/lib/rtl/i386/debug_asm.S @@ -6,7 +6,7 @@ * PROGRAMER: Alex Ionescu (alex@relsoft.net) */ -#include +#include /* GLOBALS ****************************************************************/ diff --git a/lib/rtl/i386/except_asm.s b/lib/rtl/i386/except_asm.s index dc18a60cc11..53b07c69711 100644 --- a/lib/rtl/i386/except_asm.s +++ b/lib/rtl/i386/except_asm.s @@ -9,8 +9,8 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include +#include EXTERN _RtlpCheckForActiveDebugger@0:PROC EXTERN _RtlDispatchException@8:PROC diff --git a/lib/rtl/i386/interlck.S b/lib/rtl/i386/interlck.S index 85503e5a879..7ad7a085216 100644 --- a/lib/rtl/i386/interlck.S +++ b/lib/rtl/i386/interlck.S @@ -6,7 +6,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include +#include /* FUNCTIONS ****************************************************************/ .code diff --git a/lib/rtl/i386/res_asm.s b/lib/rtl/i386/res_asm.s index 4fc9f250b0e..5af744c2308 100644 --- a/lib/rtl/i386/res_asm.s +++ b/lib/rtl/i386/res_asm.s @@ -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 -#include +#include +#include EXTERN _LdrpAccessResource@16:PROC diff --git a/lib/rtl/i386/rtlmem.s b/lib/rtl/i386/rtlmem.s index 1678daba7ba..d26f5b4ec52 100644 --- a/lib/rtl/i386/rtlmem.s +++ b/lib/rtl/i386/rtlmem.s @@ -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@reactos.org) */ -#include +#include /* GLOBALS *******************************************************************/ -- 2.17.1