From 6ee1fb490ac677784e3de5c88fd1cc98c2a628be Mon Sep 17 00:00:00 2001 From: OBattler Date: Wed, 6 Oct 2021 23:18:33 +0200 Subject: [PATCH] Made the video_copy stuff Unix-friendly. --- src/include/86box/video.h | 9 +++++++-- src/video/video.c | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/include/86box/video.h b/src/include/86box/video.h index c8cff07f8..dc41a7e5c 100644 --- a/src/include/86box/video.h +++ b/src/include/86box/video.h @@ -133,10 +133,15 @@ extern int readflash; /* Function handler pointers. */ extern void (*video_recalctimings)(void); -extern void * __cdecl (*video_copy)(void *_Dst, const void *_Src, size_t _Size); - extern void video_screenshot(uint32_t *buf, int start_x, int start_y, int row_len); + +#ifdef _WIN32 +extern void * __cdecl (*video_copy)(void *_Dst, const void *_Src, size_t _Size); extern void * __cdecl video_transform_copy(void *_Dst, const void *_Src, size_t _Size); +#ele +extern void * (*video_copy)(void *__restrict _Dst, const void *__restrict _Src, size_t _Size); +extern void * video_transform_copy(void *__restrict _Dst, const void *__restrict _Src, size_t _Size); +#endif /* Table functions. */ diff --git a/src/video/video.c b/src/video/video.c index 332f8bbaf..5118b886f 100644 --- a/src/video/video.c +++ b/src/video/video.c @@ -114,7 +114,11 @@ static const video_timings_t *vid_timings; static uint32_t cga_2_table[16]; static uint8_t thread_run = 0; +#ifdef _WIN32 void * __cdecl (*video_copy)(void *_Dst, const void *_Src, size_t _Size) = memcpy; +#else +void * (*video_copy)(void *__restrict, const void *__restrict, size_t); +#endif PALETTE cgapal = { @@ -419,8 +423,13 @@ video_screenshot(uint32_t *buf, int start_x, int start_y, int row_len) } +#ifdef _WIN32 void * __cdecl video_transform_copy(void *_Dst, const void *_Src, size_t _Size) +#else +void * +video_transform_copy(void *__restrict _Dst, const void *__restrict _Src, size_t _Size) +#endif { int i; uint32_t *dest_ex = (uint32_t *) _Dst;