diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2024-12-15 17:48:49 +0100 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2024-12-15 17:48:49 +0100 |
| commit | 42441c99cc4ef1e262a0f50e39c4056cc173c1e9 (patch) | |
| tree | e8b851172620cf0bfa4ba8bb31c55c11db2fb6c1 /src/wrapped32 | |
| parent | f7754740625b6f1749ee77e09f05956aa146f30b (diff) | |
| download | box64-42441c99cc4ef1e262a0f50e39c4056cc173c1e9.tar.gz box64-42441c99cc4ef1e262a0f50e39c4056cc173c1e9.zip | |
[BOX32][WRAPPER] More fixes on 32bits libc wrapping
Diffstat (limited to 'src/wrapped32')
| -rwxr-xr-x | src/wrapped32/wrappedlibc.c | 3 | ||||
| -rwxr-xr-x | src/wrapped32/wrappedlibc_private.h | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/wrapped32/wrappedlibc.c b/src/wrapped32/wrappedlibc.c index b0ba7c52..82ffca71 100755 --- a/src/wrapped32/wrappedlibc.c +++ b/src/wrapped32/wrappedlibc.c @@ -3304,11 +3304,14 @@ extern void* my__IO_2_1_stderr_; extern void* my__IO_2_1_stdin_ ; extern void* my__IO_2_1_stdout_; +void libc32_net_init(); + #define CUSTOM_INIT \ box64->libclib = lib; \ my_lib = lib; \ InitCpuModel(); \ ctSetup(); \ + libc32_net_init(); \ /*obstackSetup();*/ \ my32_environ = my32__environ = my32___environ = box64->envv32; \ my32___progname_full = my32_program_invocation_name = box64->argv[0]; \ diff --git a/src/wrapped32/wrappedlibc_private.h b/src/wrapped32/wrappedlibc_private.h index 481f77af..5a2390ec 100755 --- a/src/wrapped32/wrappedlibc_private.h +++ b/src/wrapped32/wrappedlibc_private.h @@ -2,6 +2,8 @@ #error Meh... #endif +//DATA not M cannot work on libc wbecause it's loaded in high memory + // FILE* is S // locale_t needs special handling, with to_locale / from_locale (and is a / A) // struct utimbuf is: LL @@ -671,8 +673,8 @@ GO(iconv_open, pEpp) GO(if_nametoindex, uEp) // imaxabs // Weak GOWS(imaxdiv, pEpII) //%% -DATA(in6addr_any, 16) // type R -DATA(in6addr_loopback, 16) // type R +DATAM(in6addr_any, 16) // type R +DATAM(in6addr_loopback, 16) // type R // inb // Weak //GOW(index, pEpi) // inet6_opt_append |