Skip to content

Commit 1d23790

Browse files
committed
clib: correct data type mismatches
1 parent e1d94d9 commit 1d23790

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

bld/clib/startup/a/cstrtw32.asm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,8 @@ donecpy:
315315
mov _winmajor,al ; ...
316316
mov _winminor,ah ; ...
317317
xchg al,ah ; ...
318-
mov _winver,ax ; ...
318+
movzx eax,ax ; ...
319+
mov _winver,eax ; ...
319320
movzx eax,hThisInstance
320321
push eax
321322
mov edi,offset filename

bld/clib/startup/c/wnmjptr.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
*
33
* Open Watcom Project
44
*
5+
* Copyright (c) 2025 The Open Watcom Contributors. All Rights Reserved.
56
* Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
67
*
78
* ========================================================================
@@ -34,7 +35,11 @@
3435
#include "rtdata.h"
3536

3637

38+
#ifdef __WINDOWS__
39+
_WCRTLINK unsigned char (*__get_winmajor_ptr( void ))
40+
#else
3741
_WCRTLINK unsigned int (*__get_winmajor_ptr( void ))
42+
#endif
3843
{
3944
return( &_RWD_winmajor );
4045
}

bld/clib/startup/c/wnmnptr.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
*
33
* Open Watcom Project
44
*
5+
* Copyright (c) 2025 The Open Watcom Contributors. All Rights Reserved.
56
* Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
67
*
78
* ========================================================================
@@ -34,7 +35,11 @@
3435
#include "rtdata.h"
3536

3637

38+
#ifdef __WINDOWS__
39+
_WCRTLINK unsigned char (*__get_winminor_ptr( void ))
40+
#else
3741
_WCRTLINK unsigned int (*__get_winminor_ptr( void ))
42+
#endif
3843
{
3944
return( &_RWD_winminor );
4045
}

0 commit comments

Comments
 (0)