about summary refs log tree commit diff stats
path: root/src/wrapped32
diff options
context:
space:
mode:
authorptitSeb <sebastien.chev@gmail.com>2024-09-01 13:59:51 +0200
committerptitSeb <sebastien.chev@gmail.com>2024-09-01 13:59:51 +0200
commit02364151bcba524825838140f3d1a61db59dab88 (patch)
tree3d6ba2cf3ea39d3ddf6119f30f84b8512b155157 /src/wrapped32
parent9178effd9f837b52107c1943e9736cf2dfc5d40d (diff)
downloadbox64-02364151bcba524825838140f3d1a61db59dab88.tar.gz
box64-02364151bcba524825838140f3d1a61db59dab88.zip
[BOX32] Some fixes to strtol/strtoul and read 32bits wrapped functions
Diffstat (limited to 'src/wrapped32')
-rwxr-xr-xsrc/wrapped32/wrappedlibc.c6
-rwxr-xr-xsrc/wrapped32/wrappedlibc_private.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/wrapped32/wrappedlibc.c b/src/wrapped32/wrappedlibc.c
index 88031874..9ed02ae3 100755
--- a/src/wrapped32/wrappedlibc.c
+++ b/src/wrapped32/wrappedlibc.c
@@ -1535,7 +1535,7 @@ static int hasDBFromAddress(uintptr_t addr)
 }
 #endif
 
-EXPORT int32_t my32_read(int fd, void* buf, uint32_t count)
+EXPORT ssize_t my32_read(int fd, void* buf, size_t count)
 {
     int ret = read(fd, buf, count);
 #ifdef DYNAREC
@@ -2874,7 +2874,7 @@ EXPORT int my32_futimes(x64emu_t* emu, int fd, uint32_t* times)
     return futimes(fd, tm);
 }
 
-EXPORT int my32_strtol(const char* s, char** endp, int base)
+EXPORT long my32_strtol(const char* s, char** endp, int base)
 {
     long ret = strtol(s, endp, base);
     if (ret<INT_MIN) {
@@ -2887,7 +2887,7 @@ EXPORT int my32_strtol(const char* s, char** endp, int base)
     return ret;
 }
 
-EXPORT unsigned int my32_strtoul(const char* s, char** endp, int base)
+EXPORT unsigned long my32_strtoul(const char* s, char** endp, int base)
 {
     unsigned long ret = strtoul(s, endp, base);
     if(ret>UINT_MAX) {
diff --git a/src/wrapped32/wrappedlibc_private.h b/src/wrapped32/wrappedlibc_private.h
index 5c4e37ce..c3da65ed 100755
--- a/src/wrapped32/wrappedlibc_private.h
+++ b/src/wrapped32/wrappedlibc_private.h
@@ -1700,7 +1700,7 @@ GOW(strtold_l, DFpBp_a)
 GO2(__strtold_l, KFpBp_a, __strtod_l)
 GOW2(strtold_l, KFpBp_a, strtod_l)
 #endif
-GO(__strtol_internal, lFpBp_i)
+GO2(__strtol_internal, lFpBp_i, my32_strtol)    //%%,noE
 GO(strtoll, IFpBp_i)
 //GO(__strtol_l, lFppiip)
 //GOW(strtol_l, lFppiip)