diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/sdl2align32.h | 4 | ||||
| -rw-r--r-- | src/include/sdl2rwops.h | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/include/sdl2align32.h b/src/include/sdl2align32.h index c1abac08..5356df81 100644 --- a/src/include/sdl2align32.h +++ b/src/include/sdl2align32.h @@ -868,14 +868,14 @@ typedef struct my_SDL2_RWops_s { void* hidden[3]; } my_SDL2_RWops_t; -typedef struct __attribute__((packed)) my_SDL2_RWops_32_s { +typedef struct my_SDL2_RWops_32_s { ptr_t size; ptr_t seek; ptr_t read; ptr_t write; ptr_t close; uint32_t type; - void* hidden[3]; // not converting hidden, just moving it + ptr_t hidden[3]; // not converting hidden, just moving it } my_SDL2_RWops_32_t; void inplace_SDL2_DisplayMode_to_64(void* a); diff --git a/src/include/sdl2rwops.h b/src/include/sdl2rwops.h index 72ead1c3..bdc54a99 100644 --- a/src/include/sdl2rwops.h +++ b/src/include/sdl2rwops.h @@ -2,6 +2,9 @@ #define __SDL2RWOPS_H__ typedef struct SDL2_RWops_s SDL2_RWops_t; // the actual SDL2 SDL_RWops +#ifdef BOX32 +typedef struct my_SDL2_RWops_32_s my_SDL2_RWops_32_t; +#endif typedef struct x64emu_s x64emu_t; typedef SDL2_RWops_t* (*sdl2_allocrw)(void); @@ -23,6 +26,9 @@ SDL2_RWops_t* AddNativeRW2(x64emu_t* emu, SDL2_RWops_t* ops); SDL2_RWops_t* RWNativeStart2(x64emu_t* emu, SDL2_RWops_t* ops); // put native RW functions, wrapping the emulated (callback style) ones if needed void RWNativeEnd2(SDL2_RWops_t* ops); // put emulated function back in place int isRWops(SDL2_RWops_t* ops); // 1 if ops seems to be a valid RWops, 0 if not +#ifdef BOX32 +int isRWops32(my_SDL2_RWops_32_t* ops); +#endif int64_t RWNativeSeek2(SDL2_RWops_t *ops, int64_t offset, int32_t whence); int64_t RWNativeSize2(SDL2_RWops_t *ops); |