From 7acd4b18479034fed3f393e405349be49c359939 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 17 Feb 2018 19:11:49 +0100 Subject: [PATCH] (Windows) Buildfixes - use fseek for MSVC 2003 and earlier --- gfx/drivers/d3d8.c | 11 +++++++++-- libretro-common/vfs/vfs_implementation.c | 2 +- menu/menu_shader.c | 2 ++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gfx/drivers/d3d8.c b/gfx/drivers/d3d8.c index 5577878ca4..713d7531dd 100644 --- a/gfx/drivers/d3d8.c +++ b/gfx/drivers/d3d8.c @@ -1647,8 +1647,15 @@ static void d3d8_set_menu_texture_enable(void *data, d3d->menu->fullscreen = full_screen; } +struct d3d8_texture_info +{ + void *userdata; + void *data; + enum texture_filter_type type; +}; + static void d3d8_video_texture_load_d3d( - struct d3d9_texture_info *info, + struct d3d8_texture_info *info, uintptr_t *id) { D3DLOCKED_RECT d3dlr; @@ -1696,8 +1703,8 @@ static int d3d8_video_texture_load_wrap_d3d(void *data) static uintptr_t d3d8_load_texture(void *video_data, void *data, bool threaded, enum texture_filter_type filter_type) { - uintptr_t id = 0; struct d3d8_texture_info info; + uintptr_t id = 0; info.userdata = video_data; info.data = data; diff --git a/libretro-common/vfs/vfs_implementation.c b/libretro-common/vfs/vfs_implementation.c index 1906ec5dc8..95fbbf1d8d 100644 --- a/libretro-common/vfs/vfs_implementation.c +++ b/libretro-common/vfs/vfs_implementation.c @@ -123,7 +123,7 @@ int64_t retro_vfs_file_seek_internal(libretro_vfs_implementation_file *stream, i /* VC2005 and up have a special 64-bit fseek */ #ifdef ATLEAST_VC2005 return _fseeki64(stream->fp, offset, whence); -#elif defined(__CELLOS_LV2__) +#elif defined(__CELLOS_LV2__) || defined(_MSC_VER) && _MSC_VER <= 1310 return fseek(stream->fp, (long)offset, whence); #else return fseeko(stream->fp, (off_t)offset, whence); diff --git a/menu/menu_shader.c b/menu/menu_shader.c index 89447b2a36..b0fa0c70db 100644 --- a/menu/menu_shader.c +++ b/menu/menu_shader.c @@ -319,6 +319,8 @@ bool menu_shader_manager_set_preset(void *data, menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh); return true; +#else + return false; #endif }