[CRT]

incude asm.inc instead of reactos/asm.h Fix a bug that smeaked into _chkstk svn path=/branches/cmake-bringup/; revision=49591
2025-06-27 03:49:43 +00:00 · 2010-11-15 01:29:12 +00:00 · 2010-11-15 01:29:12 +00:00 · ab6c2ee54c
commit ab6c2ee54c
parent 0c7d0cbc07
66 changed files with 128 additions and 112 deletions
--- a/lib/sdk/crt/except/amd64/chkstk_asm.s
+++ b/lib/sdk/crt/except/amd64/chkstk_asm.s
@ -8,11 +8,10 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
+#include <asm.inc>

-.intel_syntax noprefix

-.global MsgUnimplemented
+PUBLIC MsgUnimplemented
 MsgUnimplemented:
 .asciz "WARNING:  %s at %s:%d is UNIMPLEMENTED!\n"

@ -27,4 +26,5 @@ MsgUnimplemented:
    ret
 .endp

+END
 /* EOF */
--- a/lib/sdk/crt/except/amd64/seh.s
+++ b/lib/sdk/crt/except/amd64/seh.s
@ -8,8 +8,8 @@

 /* INCLUDES ******************************************************************/

-#include <ndk/asm.h>
-.intel_syntax noprefix
+#include <asm.inc>
+#include <ksamd64.inc>

 #define DISPOSITION_DISMISS         0
 #define DISPOSITION_CONTINUE_SEARCH 1
@ -54,3 +54,5 @@ _except_handler2:
 _except_handler3:
    ret
 .endfunc
+
+END
--- a/lib/sdk/crt/except/i386/chkstk_asm.s
+++ b/lib/sdk/crt/except/i386/chkstk_asm.s
@ -7,8 +7,9 @@
 * PROGRAMER:         KJK::Hyperion <noog@libero.it>
 */

-#include <reactos/asm.h>
-#include <ndk/asm.h>
+#include <asm.inc>
+#include <ks386.inc>
+
 #define PAGE_SIZE 4096

 PUBLIC __chkstk
@ -28,12 +29,11 @@ __alloca_probe:
    push ecx

    /* ECX = top of the previous stack frame */
-    lea eax, [esp + 8]
+    lea ecx, [esp + 8]

    /* probe the desired memory, page by page */
    cmp eax, PAGE_SIZE
-    jge .l_MoreThanAPage
-    jmp .l_LessThanAPage
+    jl .l_LessThanAPage

 .l_MoreThanAPage:

--- a/lib/sdk/crt/except/i386/prolog.s
+++ b/lib/sdk/crt/except/i386/prolog.s
@ -8,20 +8,23 @@

 /* INCLUDES ******************************************************************/

-#include <ndk/asm.h>
+#include <asm.inc>
+#include <ks386.inc>

-/* GLOBALS *******************************************************************/
-
-.globl __EH_prolog
+/* FUNCTIONS *****************************************************************/
+.code

+PUBLIC __EH_prolog
 // Copied from Wine.
 __EH_prolog:
-    pushl    $-1
-    pushl    %eax
-    pushl    %fs:0
-    movl     %esp, %fs:0
-    movl     12(%esp), %eax
-    movl     %ebp, 12(%esp)
-    leal     12(%esp), %ebp
-    pushl    %eax
+    push -1
+    push eax
+    push fs:0
+    mov fs:0, esp
+    mov eax, [esp + 12]
+    mov [esp + 12], ebp
+    lea ebp, [esp + 12]
+    push eax
    ret
+
+END
--- a/lib/sdk/crt/except/i386/seh.s
+++ b/lib/sdk/crt/except/i386/seh.s
@ -8,7 +8,7 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
+#include <asm.inc>

 #define DISPOSITION_DISMISS         0
 #define DISPOSITION_CONTINUE_SEARCH 1
--- a/lib/sdk/crt/math/amd64/alldiv.S
+++ b/lib/sdk/crt/math/amd64/alldiv.S
@ -8,8 +8,7 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>

 /* DATA *********************************************************************/

--- a/lib/sdk/crt/math/amd64/atan.S
+++ b/lib/sdk/crt/math/amd64/atan.S
@ -8,8 +8,8 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>

 /* FUNCTIONS ****************************************************************/

--- a/lib/sdk/crt/math/amd64/atan2.S
+++ b/lib/sdk/crt/math/amd64/atan2.S
@ -8,8 +8,8 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>

 /* FUNCTIONS ****************************************************************/

--- a/lib/sdk/crt/math/amd64/ceil.S
+++ b/lib/sdk/crt/math/amd64/ceil.S
@ -8,8 +8,8 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>

 /* FUNCTIONS ****************************************************************/

--- a/lib/sdk/crt/math/amd64/ceilf.S
+++ b/lib/sdk/crt/math/amd64/ceilf.S
@ -8,8 +8,8 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>

 /* FUNCTIONS ****************************************************************/

@ -26,8 +26,8 @@ ceilf:
    /* Change fpu control word to round up */
    fstcw [rsp + 8]
    mov eax, [rsp + 8]
-    or  eax, 0x00800
-    and eax, 0x0fbff
+    or  eax, HEX(00800)
+    and eax, HEX(0fbff)
    mov [rsp + 12], eax
    fldcw [rsp + 12]

@ -42,3 +42,5 @@ ceilf:
    
    add rsp, 16
    ret
+
+END
--- a/lib/sdk/crt/math/amd64/exp.S
+++ b/lib/sdk/crt/math/amd64/exp.S
@ -8,8 +8,8 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>

 /* FUNCTIONS ****************************************************************/

@ -20,3 +20,4 @@ exp:
    UNIMPLEMENTED exp
    ret

+END
--- a/lib/sdk/crt/math/amd64/fabs.S
+++ b/lib/sdk/crt/math/amd64/fabs.S
@ -8,8 +8,7 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>

 /* FUNCTIONS ****************************************************************/

--- a/lib/sdk/crt/math/amd64/floor.S
+++ b/lib/sdk/crt/math/amd64/floor.S
@ -8,8 +8,8 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>

 /* FUNCTIONS ****************************************************************/

@ -19,3 +19,5 @@ PUBLIC floor
 floor:
    UNIMPLEMENTED floor
    ret
+
+END
--- a/lib/sdk/crt/math/amd64/floorf.S
+++ b/lib/sdk/crt/math/amd64/floorf.S
@ -8,8 +8,8 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>

 /* FUNCTIONS ****************************************************************/

--- a/lib/sdk/crt/math/amd64/fmod.S
+++ b/lib/sdk/crt/math/amd64/fmod.S
@ -8,8 +8,7 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>

 /* DATA *********************************************************************/

@ -17,3 +16,5 @@ PUBLIC fmod
 fmod:
    UNIMPLEMENTED fmod
    ret
+
+END
--- a/lib/sdk/crt/math/amd64/fmodf.S
+++ b/lib/sdk/crt/math/amd64/fmodf.S
@ -8,8 +8,7 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>

 /* DATA *********************************************************************/

@ -17,3 +16,5 @@ PUBLIC fmodf
 fmodf:
    UNIMPLEMENTED fmodf
    ret
+
+END
--- a/lib/sdk/crt/math/amd64/ldexp.S
+++ b/lib/sdk/crt/math/amd64/ldexp.S
@ -8,8 +8,7 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>

 /* DATA *********************************************************************/

@ -17,3 +16,5 @@ PUBLIC ldexp
 ldexp:
    UNIMPLEMENTED ldexp
    ret
+
+END
--- a/lib/sdk/crt/math/amd64/log.S
+++ b/lib/sdk/crt/math/amd64/log.S
@ -8,8 +8,7 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>

 /* DATA *********************************************************************/

--- a/lib/sdk/crt/math/amd64/log10.S
+++ b/lib/sdk/crt/math/amd64/log10.S
@ -8,8 +8,7 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>

 /* DATA *********************************************************************/

--- a/lib/sdk/crt/math/amd64/pow.S
+++ b/lib/sdk/crt/math/amd64/pow.S
@ -8,8 +8,8 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>

 /* DATA *********************************************************************/

--- a/lib/sdk/crt/math/amd64/sqrt.S
+++ b/lib/sdk/crt/math/amd64/sqrt.S
@ -8,8 +8,8 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>

 /* DATA *********************************************************************/

@ -17,3 +17,5 @@ PUBLIC sqrt
 sqrt:
    UNIMPLEMENTED sqrt
    ret
+
+END
--- a/lib/sdk/crt/math/amd64/sqrtf.S
+++ b/lib/sdk/crt/math/amd64/sqrtf.S
@ -8,8 +8,8 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>

 /* DATA *********************************************************************/

@ -17,3 +17,5 @@ PUBLIC sqrtf
 sqrtf:
    sqrtss	xmm0, xmm0
    ret
+
+END
--- a/lib/sdk/crt/math/amd64/tan.S
+++ b/lib/sdk/crt/math/amd64/tan.S
@ -8,8 +8,8 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>

 /* DATA *********************************************************************/

@ -17,3 +17,5 @@ PUBLIC tan
 tan:
    UNIMPLEMENTED tan
    ret
+
+END
--- a/lib/sdk/crt/math/i386/alldiv_asm.s
+++ b/lib/sdk/crt/math/i386/alldiv_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC __alldiv
 PUBLIC __fltused
--- a/lib/sdk/crt/math/i386/alldvrm_asm.s
+++ b/lib/sdk/crt/math/i386/alldvrm_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC __alldvrm
 
--- a/lib/sdk/crt/math/i386/allmul_asm.s
+++ b/lib/sdk/crt/math/i386/allmul_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC __allmul

--- a/lib/sdk/crt/math/i386/allrem_asm.s
+++ b/lib/sdk/crt/math/i386/allrem_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC __allrem
 
--- a/lib/sdk/crt/math/i386/allshl_asm.s
+++ b/lib/sdk/crt/math/i386/allshl_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC __allshl

--- a/lib/sdk/crt/math/i386/allshr_asm.s
+++ b/lib/sdk/crt/math/i386/allshr_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC __allshr
 
--- a/lib/sdk/crt/math/i386/atan2_asm.s
+++ b/lib/sdk/crt/math/i386/atan2_asm.s
@ -1,5 +1,5 @@

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _atan2

--- a/lib/sdk/crt/math/i386/atan_asm.s
+++ b/lib/sdk/crt/math/i386/atan_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _atan
 
--- a/lib/sdk/crt/math/i386/aulldiv_asm.s
+++ b/lib/sdk/crt/math/i386/aulldiv_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC __aulldiv

--- a/lib/sdk/crt/math/i386/aulldvrm_asm.s
+++ b/lib/sdk/crt/math/i386/aulldvrm_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC __aulldvrm
 
--- a/lib/sdk/crt/math/i386/aullrem_asm.s
+++ b/lib/sdk/crt/math/i386/aullrem_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC __aullrem
 
--- a/lib/sdk/crt/math/i386/aullshr_asm.s
+++ b/lib/sdk/crt/math/i386/aullshr_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC __aullshr
 
--- a/lib/sdk/crt/math/i386/ceil_asm.s
+++ b/lib/sdk/crt/math/i386/ceil_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _ceil

--- a/lib/sdk/crt/math/i386/ceilf.S
+++ b/lib/sdk/crt/math/i386/ceilf.S
@ -4,7 +4,7 @@
 * No warranty is given; refer to the file DISCLAIMER.PD within this package.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 .code
 .align 4
--- a/lib/sdk/crt/math/i386/cos_asm.s
+++ b/lib/sdk/crt/math/i386/cos_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _cos

--- a/lib/sdk/crt/math/i386/exp_asm.s
+++ b/lib/sdk/crt/math/i386/exp_asm.s
@ -1,5 +1,5 @@

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _exp
 
--- a/lib/sdk/crt/math/i386/fabs_asm.s
+++ b/lib/sdk/crt/math/i386/fabs_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _fabs
 
--- a/lib/sdk/crt/math/i386/floor_asm.s
+++ b/lib/sdk/crt/math/i386/floor_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _floor
 
--- a/lib/sdk/crt/math/i386/floorf.S
+++ b/lib/sdk/crt/math/i386/floorf.S
@ -8,7 +8,7 @@
 *   Danny Smith <dannysmith@users.sourceforge.net>
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 .code
 .align 4
--- a/lib/sdk/crt/math/i386/fmod_asm.s
+++ b/lib/sdk/crt/math/i386/fmod_asm.s
@ -1,5 +1,5 @@

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _fmod
 
--- a/lib/sdk/crt/math/i386/fmodf_asm.s
+++ b/lib/sdk/crt/math/i386/fmodf_asm.s
@ -1,5 +1,5 @@

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _fmodf
 
--- a/lib/sdk/crt/math/i386/ftol_asm.s
+++ b/lib/sdk/crt/math/i386/ftol_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC __ftol
 
--- a/lib/sdk/crt/math/i386/log10_asm.s
+++ b/lib/sdk/crt/math/i386/log10_asm.s
@ -8,7 +8,7 @@
 *                    
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _log10

--- a/lib/sdk/crt/math/i386/log_asm.s
+++ b/lib/sdk/crt/math/i386/log_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _log
 
--- a/lib/sdk/crt/math/i386/pow_asm.s
+++ b/lib/sdk/crt/math/i386/pow_asm.s
@ -20,7 +20,7 @@
   02111-1307 USA.  */

 /* Reactos modifications */
-#include <reactos/asm.h>
+#include <asm.inc>

 #define ALIGNARG(log2) log2
 #define ASM_TYPE_DIRECTIVE(name,typearg)
@ -29,9 +29,8 @@

 PUBLIC _pow

-    .data
-	.text
-ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING
+.data
+ASSUME nothing

 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(infinity,@object)
@ -77,8 +76,7 @@ p63:
 #define MOX(op,x,f) op[x*f]
 #endif

-    .code
-	.text
+.code
 _pow:
 	fld qword ptr [esp + 12]	// y
 	fxam
--- a/lib/sdk/crt/math/i386/sin_asm.s
+++ b/lib/sdk/crt/math/i386/sin_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _sin

--- a/lib/sdk/crt/math/i386/sqrt_asm.s
+++ b/lib/sdk/crt/math/i386/sqrt_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _sqrt
 
--- a/lib/sdk/crt/math/i386/tan_asm.s
+++ b/lib/sdk/crt/math/i386/tan_asm.s
@ -34,7 +34,7 @@
 * SUCH DAMAGE.
 */

-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _tan
 
--- a/lib/sdk/crt/mem/i386/memchr_asm.s
+++ b/lib/sdk/crt/mem/i386/memchr_asm.s
@ -5,7 +5,8 @@
 * FILE:            lib/sdk/crt/mem/i386/memchr.s
 */

-#include <reactos/asm.h>
+#include <asm.inc>
+#include <ks386.inc>

 /*
 * void* memchr(const void* s, int c, size_t n)
--- a/lib/sdk/crt/mem/i386/memmove_asm.s
+++ b/lib/sdk/crt/mem/i386/memmove_asm.s
@ -1,10 +1,10 @@
 /*
 * void *memcpy (void *to, const void *from, size_t count)
 *
- * NOTE: This code is a duplicate of memmove function from memmove_asm.s
 */

-#include <reactos/asm.h>
+#include <asm.inc>
+#include <ks386.inc>

 PUBLIC _memcpy
 PUBLIC _memmove
--- a/lib/sdk/crt/mem/i386/memset_asm.s
+++ b/lib/sdk/crt/mem/i386/memset_asm.s
@ -2,7 +2,8 @@
 * $Id$
 */

-#include <reactos/asm.h>
+#include <asm.inc>
+#include <ks386.inc>

 /*
 * void *memset (void *src, int val, size_t count)
--- a/lib/sdk/crt/setjmp/amd64/setjmp.s
+++ b/lib/sdk/crt/setjmp/amd64/setjmp.s
@ -8,8 +8,8 @@

 /* INCLUDES ******************************************************************/

-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>

 #define JUMP_BUFFER_Frame 0x00
 #define JUMP_BUFFER_Rbx   0x08
@ -156,3 +156,5 @@ PUBLIC longjmp
    inc rax
 2:  jmp r8
 .endp longjmp
+
+END
--- a/lib/sdk/crt/setjmp/i386/setjmp.s
+++ b/lib/sdk/crt/setjmp/i386/setjmp.s
@ -9,8 +9,7 @@
 *                    complete implementation
 */

-#include <reactos/asm.h>
-#include <ndk/asm.h>
+#include <asm.inc>

 #define JB_BP  0
 #define JB_BX  1
--- a/lib/sdk/crt/string/i386/tcscat.inc
+++ b/lib/sdk/crt/string/i386/tcscat.inc
@ -2,7 +2,7 @@
 */

 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _tcscat
 .code
--- a/lib/sdk/crt/string/i386/tcschr.inc
+++ b/lib/sdk/crt/string/i386/tcschr.inc
@ -2,7 +2,7 @@
 */

 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _tcschr
 .code
--- a/lib/sdk/crt/string/i386/tcscmp.inc
+++ b/lib/sdk/crt/string/i386/tcscmp.inc
@ -2,7 +2,7 @@
 */

 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _tcscmp
 .code
--- a/lib/sdk/crt/string/i386/tcscpy.inc
+++ b/lib/sdk/crt/string/i386/tcscpy.inc
@ -2,7 +2,7 @@
 */

 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _tcscpy
 .code
--- a/lib/sdk/crt/string/i386/tcslen.inc
+++ b/lib/sdk/crt/string/i386/tcslen.inc
@ -2,7 +2,7 @@
 */

 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _tcslen
 .code
--- a/lib/sdk/crt/string/i386/tcsncat.inc
+++ b/lib/sdk/crt/string/i386/tcsncat.inc
@ -2,7 +2,7 @@
 */

 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _tcsncat
 .code
--- a/lib/sdk/crt/string/i386/tcsncmp.inc
+++ b/lib/sdk/crt/string/i386/tcsncmp.inc
@ -2,7 +2,7 @@
 */

 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _tcsncmp
 .code
--- a/lib/sdk/crt/string/i386/tcsncpy.inc
+++ b/lib/sdk/crt/string/i386/tcsncpy.inc
@ -2,7 +2,7 @@
 */

 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _tcsncpy
 .code
--- a/lib/sdk/crt/string/i386/tcsnlen.inc
+++ b/lib/sdk/crt/string/i386/tcsnlen.inc
@ -2,7 +2,7 @@
 */

 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _tcsnlen
 .code
--- a/lib/sdk/crt/string/i386/tcsrchr.inc
+++ b/lib/sdk/crt/string/i386/tcsrchr.inc
@ -2,7 +2,7 @@
 */

 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>

 PUBLIC _tcsrchr
 .code